Skip to content

Commit 27a94e1

Browse files
CI: Fix homebrew path on Intel hardware
1 parent a7a4394 commit 27a94e1

1 file changed

Lines changed: 8 additions & 5 deletions

File tree

build/build-publish-solvers/solver-yices.xml

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,9 @@ SPDX-License-Identifier: Apache-2.0
5454
<condition property="build.architecture" value="arm64" else="x64">
5555
<os arch="aarch64"/>
5656
</condition>
57+
<condition property="build.homebrew" value="${build.homebrew}" else="/usr/local">
58+
<os arch="aarch64"/>
59+
</condition>
5760
</target>
5861

5962
<target name="download-cudd" depends="build-initialize" unless="cudd.downloaded">
@@ -157,8 +160,8 @@ SPDX-License-Identifier: Apache-2.0
157160
<arg value=".."/>
158161
<arg value="-DCMAKE_BUILD_TYPE=Release"/>
159162
<arg value="-DCMAKE_INSTALL_PREFIX=${yices2.buildDir}/libpoly/install/${build.architecture}-macos"/>
160-
<arg value="-DGMP_INCLUDE_DIR=/opt/homebrew/include"/>
161-
<arg value="-DGMP_LIBRARY=/opt/homebrew/lib/libgmp.a"/>
163+
<arg value="-DGMP_INCLUDE_DIR=${build.homebrew}/include"/>
164+
<arg value="-DGMP_LIBRARY=${build.homebrew}/lib/libgmp.a"/>
162165
<arg value="-DLIBPOLY_BUILD_PYTHON_API=OFF"/>
163166
</exec>
164167
<exec executable="make" dir="${yices2.buildDir}/libpoly/build" failonerror="true">
@@ -232,8 +235,8 @@ SPDX-License-Identifier: Apache-2.0
232235
<mkdir dir="${yices2.buildDir}/yices2/install"/>
233236
<!-- macOS build -->
234237
<exec executable="./configure" dir="${yices2.buildDir}/yices2" failonerror="true">
235-
<env key="LDFLAGS" value="-L/opt/homebrew/lib -L${yices2.buildDir}/libpoly/install/${build.architecture}-macos/lib -L${yices2.buildDir}/cudd/install/${build.architecture}-macos/lib"/>
236-
<env key="CFLAGS" value="-I/opt/homebrew/include -I${yices2.buildDir}/libpoly/install/${build.architecture}-macos/include -I${yices2.buildDir}/cudd/install/${build.architecture}-macos/include"/>
238+
<env key="LDFLAGS" value="-L${build.homebrew}/lib -L${yices2.buildDir}/libpoly/install/${build.architecture}-macos/lib -L${yices2.buildDir}/cudd/install/${build.architecture}-macos/lib"/>
239+
<env key="CFLAGS" value="-I${build.homebrew}/include -I${yices2.buildDir}/libpoly/install/${build.architecture}-macos/include -I${yices2.buildDir}/cudd/install/${build.architecture}-macos/include"/>
237240
<arg value="--enable-mcsat"/>
238241
<arg value="--enable-thread-safety"/>
239242
<arg value="--prefix=${yices2.buildDir}/yices2/install/${build.architecture}-macos"/>
@@ -312,7 +315,7 @@ SPDX-License-Identifier: Apache-2.0
312315
<exec executable="ant" dir="${yices2.buildDir}/yices2_java_bindings" failonerror="true">
313316
<env key="OS" value="darwin"/>
314317
<env key="JNI_PATH" value="${java.home}/include"/>
315-
<env key="GMP_PATH" value="/opt/homebrew"/>
318+
<env key="GMP_PATH" value="${build.homebrew}"/>
316319
<env key="CUDD_PATH" value="${yices2.buildDir}/cudd/install/${build.architecture}-macos"/>
317320
<env key="POLY_PATH" value="${yices2.buildDir}/libpoly/install/${build.architecture}-macos"/>
318321
<env key="YICES_PATH" value="${yices2.buildDir}/yices2/install/${build.architecture}-macos"/>

0 commit comments

Comments
 (0)