diff options
| author | r-burns <52847440+r-burns@users.noreply.github.com> | 2021-09-23 17:55:08 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-23 17:55:08 -0700 |
| commit | 16728283c3341d3dfe44b899f2a9ec9138b98019 (patch) | |
| tree | d21591b9bacfd6dd45cc6df6d1b68bc4cae72a9b /pkgs/build-support/bintools-wrapper | |
| parent | da64747b375aa8c34488a42f91891001e6aa8398 (diff) | |
| parent | a41b83c0ffb765d52f78730082566f6e56620412 (diff) | |
| download | nixpkgs-16728283c3341d3dfe44b899f2a9ec9138b98019.tar nixpkgs-16728283c3341d3dfe44b899f2a9ec9138b98019.tar.gz nixpkgs-16728283c3341d3dfe44b899f2a9ec9138b98019.tar.bz2 nixpkgs-16728283c3341d3dfe44b899f2a9ec9138b98019.tar.lz nixpkgs-16728283c3341d3dfe44b899f2a9ec9138b98019.tar.xz nixpkgs-16728283c3341d3dfe44b899f2a9ec9138b98019.tar.zst nixpkgs-16728283c3341d3dfe44b899f2a9ec9138b98019.zip | |
Merge pull request #135619 from r-burns/fpie-musl-fixes
[staging] {cc,binutils}-wrapper: fixes for PIE hardeningDiffstat (limited to 'pkgs/build-support/bintools-wrapper')
| -rw-r--r-- | pkgs/build-support/bintools-wrapper/add-hardening.sh | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/pkgs/build-support/bintools-wrapper/add-hardening.sh b/pkgs/build-support/bintools-wrapper/add-hardening.sh index 4d289a334b7..0a2b2509a82 100644 --- a/pkgs/build-support/bintools-wrapper/add-hardening.sh +++ b/pkgs/build-support/bintools-wrapper/add-hardening.sh @@ -37,7 +37,11 @@ fi for flag in "${!hardeningEnableMap[@]}"; do case $flag in pie) - if [[ ! ("$*" =~ " -shared " || "$*" =~ " -static " || "$*" =~ " -r " || "$*" =~ " -Ur " || "$*" =~ " -i ") ]]; then + if [[ ! (" $* " =~ " -shared " \ + || " $* " =~ " -static " \ + || " $* " =~ " -r " \ + || " $* " =~ " -Ur " \ + || " $* " =~ " -i ") ]]; then if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling LDFlags -pie >&2; fi hardeningLDFlags+=('-pie') fi |