Skip to content

Commit b0bdc0a

Browse files
committed
fix the patch macOS Intel GMP
Signed-off-by: Panagiotis Georgiadis <pgeorgia@redhat.com>
1 parent 7251a73 commit b0bdc0a

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ jobs:
7171
run: |
7272
git config --global user.email "builds@travis-ci.com"
7373
git config --global user.name "Travis CI"
74-
brew install automake texinfo
74+
brew install autoconf automake libtool texinfo
7575
mkdir -p build
7676
cd build
7777
cmake ..

CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -216,18 +216,18 @@ function(toolchain_deps toolchain_deps_dir toolchain_install_dir toolchain_suffi
216216
# GMP assembly causes issues on macOS - need to disable it and use PIC
217217
if(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
218218
set(gmp_asm_flag --disable-assembly)
219-
set(gmp_pic_flags "CFLAGS=-fPIC -fexceptions" "CXXFLAGS=-fPIC")
219+
set(gmp_env_command ${CMAKE_COMMAND} -E env "CFLAGS=-fPIC -fexceptions" "CXXFLAGS=-fPIC")
220220
else()
221221
set(gmp_asm_flag "")
222-
set(gmp_pic_flags "CPPFLAGS=-fexceptions")
222+
set(gmp_env_command ${CMAKE_COMMAND} -E env "CPPFLAGS=-fexceptions")
223223
endif()
224224

225225
ExternalProject_add(gmp${suffix}
226226
URL https://ftpmirror.gnu.org/gnu/gmp/gmp-${GMP_VERSION}.tar.bz2
227227
URL_HASH ${GMP_HASH}
228228
DOWNLOAD_DIR ${DOWNLOAD_DIR}
229229
PATCH_COMMAND sh ${PROJECT_SOURCE_DIR}/cmake/update_config_files.sh <SOURCE_DIR>
230-
CONFIGURE_COMMAND ${gmp_pic_flags} ${compiler_flags} ${wrapper_command} <SOURCE_DIR>/configure
230+
CONFIGURE_COMMAND ${gmp_env_command} ${compiler_flags} ${wrapper_command} <SOURCE_DIR>/configure
231231
--build=${build_native}
232232
--host=${toolchain_host}
233233
--prefix=${toolchain_deps_dir}

0 commit comments

Comments
 (0)