diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2016-08-24 10:59:52 +0200 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2016-08-24 10:59:52 +0200 |
| commit | 8576aea57c1d23d7f65bf3b4f1cace2d656a960a (patch) | |
| tree | 8c8b5f69ea400e61965552bd74a1bf8775934892 /pkgs/build-support/cc-wrapper/add-hardening.sh | |
| parent | 17234ca0732b7b7ecadd635ee258da98dd5b36a8 (diff) | |
| download | nixlib-8576aea57c1d23d7f65bf3b4f1cace2d656a960a.tar nixlib-8576aea57c1d23d7f65bf3b4f1cace2d656a960a.tar.gz nixlib-8576aea57c1d23d7f65bf3b4f1cace2d656a960a.tar.bz2 nixlib-8576aea57c1d23d7f65bf3b4f1cace2d656a960a.tar.lz nixlib-8576aea57c1d23d7f65bf3b4f1cace2d656a960a.tar.xz nixlib-8576aea57c1d23d7f65bf3b4f1cace2d656a960a.tar.zst nixlib-8576aea57c1d23d7f65bf3b4f1cace2d656a960a.zip | |
cc-wrapper: fix detection of unsupported linker flags
Diffstat (limited to 'pkgs/build-support/cc-wrapper/add-hardening.sh')
| -rw-r--r-- | pkgs/build-support/cc-wrapper/add-hardening.sh | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/pkgs/build-support/cc-wrapper/add-hardening.sh b/pkgs/build-support/cc-wrapper/add-hardening.sh index 60e62ffad608..b98833b3513b 100644 --- a/pkgs/build-support/cc-wrapper/add-hardening.sh +++ b/pkgs/build-support/cc-wrapper/add-hardening.sh @@ -4,17 +4,11 @@ hardeningCFlags=() hardeningLDFlags=() hardeningDisable=${hardeningDisable:-""} -if [[ -z "@ld_supports_bindnow@" ]]; then - hardeningDisable+=" bindnow" -fi - -if [[ -z "@ld_supports_relro@" ]]; then - hardeningDisable+=" relro" -fi +hardeningDisable+=" @hardening_unsupported_flags@" if [[ -n "$NIX_DEBUG" ]]; then echo HARDENING: Value of '$hardeningDisable': $hardeningDisable >&2; fi -if [[ ! $hardeningDisable == "all" ]]; then +if [[ ! $hardeningDisable =~ "all" ]]; then if [[ -n "$NIX_DEBUG" ]]; then echo 'HARDENING: Is active (not completely disabled with "all" flag)' >&2; fi for flag in "${hardeningFlags[@]}" do |