diff options
| author | Charles Strahan <charles@cstrahan.com> | 2018-03-05 21:27:00 -0500 |
|---|---|---|
| committer | Charles Strahan <charles@cstrahan.com> | 2018-03-06 00:30:09 -0500 |
| commit | fc46895e86a33232abbcf8dcee9033d5c58d2f2d (patch) | |
| tree | 1af5acbe105683242240f13ece84391296723852 | |
| parent | cc7ce57f86b0cff87ac74074d45c993cf4ccf6ab (diff) | |
| download | nixpkgs-fc46895e86a33232abbcf8dcee9033d5c58d2f2d.tar nixpkgs-fc46895e86a33232abbcf8dcee9033d5c58d2f2d.tar.gz nixpkgs-fc46895e86a33232abbcf8dcee9033d5c58d2f2d.tar.bz2 nixpkgs-fc46895e86a33232abbcf8dcee9033d5c58d2f2d.tar.lz nixpkgs-fc46895e86a33232abbcf8dcee9033d5c58d2f2d.tar.xz nixpkgs-fc46895e86a33232abbcf8dcee9033d5c58d2f2d.tar.zst nixpkgs-fc46895e86a33232abbcf8dcee9033d5c58d2f2d.zip | |
hardening: allow user supplied flags to override
Put hardening flags before user supplied flags.
| -rw-r--r-- | pkgs/build-support/bintools-wrapper/ld-wrapper.sh | 4 | ||||
| -rw-r--r-- | pkgs/build-support/cc-wrapper/cc-wrapper.sh | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/build-support/bintools-wrapper/ld-wrapper.sh b/pkgs/build-support/bintools-wrapper/ld-wrapper.sh index 991ed0fe263..bbab9a6b71d 100644 --- a/pkgs/build-support/bintools-wrapper/ld-wrapper.sh +++ b/pkgs/build-support/bintools-wrapper/ld-wrapper.sh @@ -57,8 +57,8 @@ fi source @out@/nix-support/add-hardening.sh -extraAfter=("${hardeningLDFlags[@]}") -extraBefore=() +extraAfter=() +extraBefore=("${hardeningLDFlags[@]}") if [ -z "${NIX_@infixSalt@_LDFLAGS_SET:-}" ]; then extraAfter+=($NIX_@infixSalt@_LDFLAGS) diff --git a/pkgs/build-support/cc-wrapper/cc-wrapper.sh b/pkgs/build-support/cc-wrapper/cc-wrapper.sh index c2e6c140635..d1018193e5a 100644 --- a/pkgs/build-support/cc-wrapper/cc-wrapper.sh +++ b/pkgs/build-support/cc-wrapper/cc-wrapper.sh @@ -134,8 +134,8 @@ fi source @out@/nix-support/add-hardening.sh # Add the flags for the C compiler proper. -extraAfter=($NIX_@infixSalt@_CFLAGS_COMPILE "${hardeningCFlags[@]}") -extraBefore=() +extraAfter=($NIX_@infixSalt@_CFLAGS_COMPILE) +extraBefore=("${hardeningCFlags[@]}") if [ "$dontLink" != 1 ]; then |