diff options
author | Nikolay Amiantov <ab@fmap.me> | 2016-03-15 19:35:07 +0300 |
---|---|---|
committer | Nikolay Amiantov <ab@fmap.me> | 2016-03-24 20:16:17 +0300 |
commit | 0c6db0ca48612f18e5c2b744dfa385ba8eecc950 (patch) | |
tree | b09a03993f3aabe6d2f6635e345eb3ee044f7f47 /pkgs/build-support/cc-wrapper | |
parent | 89693e71b9c89b348ef2173180c4965c0e7d8357 (diff) | |
download | nixlib-0c6db0ca48612f18e5c2b744dfa385ba8eecc950.tar nixlib-0c6db0ca48612f18e5c2b744dfa385ba8eecc950.tar.gz nixlib-0c6db0ca48612f18e5c2b744dfa385ba8eecc950.tar.bz2 nixlib-0c6db0ca48612f18e5c2b744dfa385ba8eecc950.tar.lz nixlib-0c6db0ca48612f18e5c2b744dfa385ba8eecc950.tar.xz nixlib-0c6db0ca48612f18e5c2b744dfa385ba8eecc950.tar.zst nixlib-0c6db0ca48612f18e5c2b744dfa385ba8eecc950.zip |
cc-wrapper: add option to skip flags for native optimizations
Diffstat (limited to 'pkgs/build-support/cc-wrapper')
-rw-r--r-- | pkgs/build-support/cc-wrapper/cc-wrapper.sh | 14 | ||||
-rw-r--r-- | pkgs/build-support/cc-wrapper/gnat-wrapper.sh | 14 |
2 files changed, 28 insertions, 0 deletions
diff --git a/pkgs/build-support/cc-wrapper/cc-wrapper.sh b/pkgs/build-support/cc-wrapper/cc-wrapper.sh index 41567fde2694..3b6f2acfee8b 100644 --- a/pkgs/build-support/cc-wrapper/cc-wrapper.sh +++ b/pkgs/build-support/cc-wrapper/cc-wrapper.sh @@ -91,6 +91,20 @@ if [ "$NIX_ENFORCE_PURITY" = 1 -a -n "$NIX_STORE" ]; then params=("${rest[@]}") fi + +# Clear march/mtune=native -- they bring impurity. +if [ "$NIX_ENFORCE_NO_NATIVE" = 1 ]; then + rest=() + for i in "${params[@]}"; do + if [[ "$i" = -m*=native ]]; then + skip $i + else + rest=("${rest[@]}" "$i") + fi + done + params=("${rest[@]}") +fi + if [[ "$isCpp" = 1 ]]; then NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE ${NIX_CXXSTDLIB_COMPILE-@default_cxx_stdlib_compile@}" NIX_CFLAGS_LINK="$NIX_CFLAGS_LINK $NIX_CXXSTDLIB_LINK" diff --git a/pkgs/build-support/cc-wrapper/gnat-wrapper.sh b/pkgs/build-support/cc-wrapper/gnat-wrapper.sh index ae46b40ac631..4b3ba386917c 100644 --- a/pkgs/build-support/cc-wrapper/gnat-wrapper.sh +++ b/pkgs/build-support/cc-wrapper/gnat-wrapper.sh @@ -70,6 +70,20 @@ if [ "$NIX_ENFORCE_PURITY" = 1 -a -n "$NIX_STORE" ]; then fi +# Clear march/mtune=native -- they bring impurity. +if [ "$NIX_ENFORCE_NO_NATIVE" = 1 ]; then + rest=() + for i in "${params[@]}"; do + if [[ "$i" = -m*=native ]]; then + skip $i + else + rest=("${rest[@]}" "$i") + fi + done + params=("${rest[@]}") +fi + + # Add the flags for the GNAT compiler proper. extraAfter=($NIX_GNATFLAGS_COMPILE) extraBefore=() |