diff options
author | John Ericson <Ericson2314@yahoo.com> | 2018-08-17 16:12:26 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-17 16:12:26 -0400 |
commit | 89efc27f571368b475ce87e71445be10a9d1121a (patch) | |
tree | 4e15a2a140d55effe691a0f127175dd4f0ba986f /pkgs/build-support/cc-wrapper | |
parent | d0f11020ca55dfe20ecad05005343e3a3e3cbd90 (diff) | |
parent | 30ea1bfd221277735e1e19ab916e96709759bd51 (diff) | |
download | nixpkgs-89efc27f571368b475ce87e71445be10a9d1121a.tar nixpkgs-89efc27f571368b475ce87e71445be10a9d1121a.tar.gz nixpkgs-89efc27f571368b475ce87e71445be10a9d1121a.tar.bz2 nixpkgs-89efc27f571368b475ce87e71445be10a9d1121a.tar.lz nixpkgs-89efc27f571368b475ce87e71445be10a9d1121a.tar.xz nixpkgs-89efc27f571368b475ce87e71445be10a9d1121a.tar.zst nixpkgs-89efc27f571368b475ce87e71445be10a9d1121a.zip |
Merge pull request #44767 from obsidiansystems/wrapper-env-var-path
{cc,bintools}-wrapper, ghc, libgcc: Define wrapper env vars as full paths
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 28060de7411..619e75a3974 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=@named_cc@ -export ${role_pre}CXX=@named_cxx@ -export CC${role_post}=@named_cc@ -export CXX${role_post}=@named_cxx@ +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@ # If unset, assume the default hardening flags. : ${NIX_HARDENING_ENABLE="fortify stackprotector pic strictoverflow format relro bindnow"} |