diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2017-06-26 01:12:38 +0200 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2017-06-26 01:12:38 +0200 |
| commit | d42f502c84805e85957b264a93f4cc196d41bed9 (patch) | |
| tree | 53ef1184727ca724b50d2fbbe490d45e09c05ab6 /pkgs/build-support | |
| parent | a4252649bfa0a885a69785718ca624e3eae65595 (diff) | |
| download | nixlib-d42f502c84805e85957b264a93f4cc196d41bed9.tar nixlib-d42f502c84805e85957b264a93f4cc196d41bed9.tar.gz nixlib-d42f502c84805e85957b264a93f4cc196d41bed9.tar.bz2 nixlib-d42f502c84805e85957b264a93f4cc196d41bed9.tar.lz nixlib-d42f502c84805e85957b264a93f4cc196d41bed9.tar.xz nixlib-d42f502c84805e85957b264a93f4cc196d41bed9.tar.zst nixlib-d42f502c84805e85957b264a93f4cc196d41bed9.zip | |
Revert "cc-wrapper: add stackcheck hardening (stack clash)"
This reverts commit 4150f5e8ba650416dcb8956c9835885cc6a2a80d. The stack protector hardening breaks the llvm_4 build.
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/cc-wrapper/add-hardening.sh | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/pkgs/build-support/cc-wrapper/add-hardening.sh b/pkgs/build-support/cc-wrapper/add-hardening.sh index 2419b567d57d..b98833b3513b 100644 --- a/pkgs/build-support/cc-wrapper/add-hardening.sh +++ b/pkgs/build-support/cc-wrapper/add-hardening.sh @@ -1,4 +1,4 @@ -hardeningFlags=(fortify stackprotector pic strictoverflow format relro bindnow stackcheck) +hardeningFlags=(fortify stackprotector pic strictoverflow format relro bindnow) hardeningFlags+=("${hardeningEnable[@]}") hardeningCFlags=() hardeningLDFlags=() @@ -50,11 +50,7 @@ if [[ ! $hardeningDisable =~ "all" ]]; then if [[ -n "$NIX_DEBUG" ]]; then echo HARDENING: enabling bindnow >&2; fi hardeningLDFlags+=('-z' 'now') ;; - stackcheck) - if [[ -n "$NIX_DEBUG" ]]; then echo HARDENING: enabling stackcheck >&2; fi - hardeningCFlags+=('-fstack-check=specific') - ;; - *) + *) echo "Hardening flag unknown: $flag" >&2 ;; esac |