Skip to content
This repository has been archived by the owner on Jan 30, 2023. It is now read-only.

Commit

Permalink
tox.ini (macos-nohomebrew): Pass compiler configuration to configure …
Browse files Browse the repository at this point in the history
…using variables other than CC, CXX.

Previously, they were in the environment also at 'make' time
and due to our design in 'sage-env' override the actual
configured compilers from the 'configure' run, which
includes additional options (-std=....)
  • Loading branch information
Matthias Koeppe committed Mar 28, 2021
1 parent 9d9c562 commit 236ea3c
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
2 changes: 2 additions & 0 deletions build/bin/sage-spkg
Original file line number Diff line number Diff line change
Expand Up @@ -646,6 +646,8 @@ fi
# Actually install
##################################################################

env

# Set the $SAGE_DESTDIR variable to be passed to the spkg-install
# script (the script itself could set this, but better to standardize
# this in one place)
Expand Down
6 changes: 3 additions & 3 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -417,9 +417,9 @@ setenv =
gcc_9: CONFIG_CONFIGURE_ARGS_2=--with-system-gcc=force CC=gcc-9 CXX=g++-9 FC=gfortran-9
gcc_10: CONFIG_CONFIGURE_ARGS_2=--with-system-gcc=force CC=gcc-10 CXX=g++-10 FC=gfortran-10
gcc_11: CONFIG_CONFIGURE_ARGS_2=--with-system-gcc=force CC=gcc-11 CXX=g++-11 FC=gfortran-11
macos-nohomebrew: CONFIG_CONFIGURE_ARGS_2=--with-system-gcc=force --with-mp=gmp --without-system-mpfr --without-system-readline
macos-nohomebrew: CXX=g++ -isysroot {env:MACOS_SDK}
macos-nohomebrew: CC=gcc -isysroot {env:MACOS_SDK}
macos-nohomebrew: CONFIG_CONFIGURE_ARGS_2=--with-system-gcc=force CC="$CONFIGURED_CC" CXX="$CONFIGURED_CXX" --with-mp=gmp --without-system-mpfr --without-system-readline --without-system-boost
macos-nohomebrew: CONFIGURED_CXX=g++ -isysroot {env:MACOS_SDK}
macos-nohomebrew: CONFIGURED_CC=gcc -isysroot {env:MACOS_SDK}
# We use libgd only used in a very limited way, in {matrix,vector}_mod_2_dense. Disable search for other packages.
macos-nohomebrew: LIBGD_CONFIGURE=--without-freetype --without-raqm --without-fontconfig --without-jpeg --without-liq --without-xpm --without-tiff --without-webp --without-heif --without-avif
macos: MACOS_SDK=/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk
Expand Down

0 comments on commit 236ea3c

Please sign in to comment.