diff options
| author | tamasmeszaros <meszaros.q@gmail.com> | 2020-03-18 14:17:05 +0300 |
|---|---|---|
| committer | tamasmeszaros <meszaros.q@gmail.com> | 2020-03-18 14:18:07 +0300 |
| commit | abdcc88e9a498d313acc66724240e12b8f7acbbe (patch) | |
| tree | 03f9b54dcce5e790fff3c186741f0698dcdfb806 /deps | |
| parent | f4aa9c5b0e76f82e7f333e8692b66401bba52027 (diff) | |
Add explicit flags for GMP and MPFR
Bump up arm version to 7
armv7-a has to be added as march, rpi4 fails to build with plain armv7
fixes #3847
Diffstat (limited to 'deps')
| -rw-r--r-- | deps/GMP/GMP.cmake | 18 | ||||
| -rw-r--r-- | deps/MPFR/MPFR.cmake | 4 |
2 files changed, 19 insertions, 3 deletions
diff --git a/deps/GMP/GMP.cmake b/deps/GMP/GMP.cmake index 4e8228cba..08b286891 100644 --- a/deps/GMP/GMP.cmake +++ b/deps/GMP/GMP.cmake @@ -17,11 +17,27 @@ if (MSVC) add_custom_target(dep_GMP SOURCES ${_output}) else () + set(_gmp_ccflags "-O2 -DNDEBUG -fPIC -DPIC -Wall -Wmissing-prototypes -Wpointer-arith -pedantic -fomit-frame-pointer -fno-common") + set(_gmp_build_tgt "${CMAKE_SYSTEM_PROCESSOR}") + if (${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm") + set(_gmp_ccflags "${_gmp_ccflags} -march=armv7-a") # Works on RPi-4 + set(_gmp_build_tgt armv7) + endif() + + if (APPLE) + set(_gmp_ccflags "${_gmp_ccflags} -mmacosx-version-min=${DEP_OSX_TARGET}") + set(_gmp_build_tgt "--build=${_gmp_build_tgt}-apple-darwin") + elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux") + set(_gmp_build_tgt "--build=${_gmp_build_tgt}-pc-linux-gnu") + else () + set(_gmp_build_tgt "") # let it guess + endif() + ExternalProject_Add(dep_GMP # URL https://gmplib.org/download/gmp/gmp-6.1.2.tar.bz2 URL https://gmplib.org/download/gmp/gmp-6.2.0.tar.lz BUILD_IN_SOURCE ON - CONFIGURE_COMMAND ./configure --enable-shared=no --enable-cxx=yes --enable-static=yes "--prefix=${DESTDIR}/usr/local" --with-pic + CONFIGURE_COMMAND env "CFLAGS=${_gmp_ccflags}" "CXXFLAGS=${_gmp_ccflags}" ./configure --enable-shared=no --enable-cxx=yes --enable-static=yes "--prefix=${DESTDIR}/usr/local" ${_gmp_build_tgt} BUILD_COMMAND make -j INSTALL_COMMAND make install ) diff --git a/deps/MPFR/MPFR.cmake b/deps/MPFR/MPFR.cmake index cda7eeea9..ddbb178d8 100644 --- a/deps/MPFR/MPFR.cmake +++ b/deps/MPFR/MPFR.cmake @@ -21,9 +21,9 @@ else () ExternalProject_Add(dep_MPFR URL http://ftp.vim.org/ftp/gnu/mpfr/mpfr-3.1.6.tar.bz2 https://www.mpfr.org/mpfr-3.1.6/mpfr-3.1.6.tar.bz2 # mirrors are allowed BUILD_IN_SOURCE ON - CONFIGURE_COMMAND ./configure --prefix=${DESTDIR}/usr/local --enable-shared=no --enable-static=yes --with-gmp=${DESTDIR}/usr/local --with-pic + CONFIGURE_COMMAND env "CFLAGS=${_gmp_ccflags}" "CXXFLAGS=${_gmp_ccflags}" ./configure --prefix=${DESTDIR}/usr/local --enable-shared=no --enable-static=yes --with-gmp=${DESTDIR}/usr/local ${_gmp_build_tgt} BUILD_COMMAND make -j INSTALL_COMMAND make install DEPENDS dep_GMP ) -endif ()
\ No newline at end of file +endif () |