diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2018-08-21 15:15:02 -0500 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2018-08-22 01:14:53 +0200 |
| commit | 13c8acc3dbae2ddb8257fd7f795b9bf6fe739a7b (patch) | |
| tree | 97a5964b24ae870c5e4b924014bf28eb858e07ce /pkgs/build-support/cc-wrapper | |
| parent | 8e4d051c622366e37ca19276aaf88d47648e4dce (diff) | |
| download | nixlib-13c8acc3dbae2ddb8257fd7f795b9bf6fe739a7b.tar nixlib-13c8acc3dbae2ddb8257fd7f795b9bf6fe739a7b.tar.gz nixlib-13c8acc3dbae2ddb8257fd7f795b9bf6fe739a7b.tar.bz2 nixlib-13c8acc3dbae2ddb8257fd7f795b9bf6fe739a7b.tar.lz nixlib-13c8acc3dbae2ddb8257fd7f795b9bf6fe739a7b.tar.xz nixlib-13c8acc3dbae2ddb8257fd7f795b9bf6fe739a7b.tar.zst nixlib-13c8acc3dbae2ddb8257fd7f795b9bf6fe739a7b.zip | |
Revert "Merge pull request #44767 from obsidiansystems/wrapper-env-var-path"
This reverts commit 89efc27f571368b475ce87e71445be10a9d1121a, reversing changes made to d0f11020ca55dfe20ecad05005343e3a3e3cbd90.
Diffstat (limited to 'pkgs/build-support/cc-wrapper')
| -rw-r--r-- | pkgs/build-support/cc-wrapper/setup-hook.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/build-support/cc-wrapper/setup-hook.sh b/pkgs/build-support/cc-wrapper/setup-hook.sh index 619e75a39748..28060de74118 100644 --- a/pkgs/build-support/cc-wrapper/setup-hook.sh +++ b/pkgs/build-support/cc-wrapper/setup-hook.sh @@ -109,10 +109,10 @@ fi export NIX_${role_pre}CC=@out@ -export ${role_pre}CC=@out@/bin/@named_cc@ -export ${role_pre}CXX=@out@/bin/@named_cxx@ -export CC${role_post}=@out@/bin/@named_cc@ -export CXX${role_post}=@out@/bin/@named_cxx@ +export ${role_pre}CC=@named_cc@ +export ${role_pre}CXX=@named_cxx@ +export CC${role_post}=@named_cc@ +export CXX${role_post}=@named_cxx@ # If unset, assume the default hardening flags. : ${NIX_HARDENING_ENABLE="fortify stackprotector pic strictoverflow format relro bindnow"} |