Skip to content

top-level: common subexpression elimination for cc-wrapper usage #25186

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Ericson2314 merged 1 commit into from
Apr 24, 2017
Merged

top-level: common subexpression elimination for cc-wrapper usage #25186

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1636,7 +1636,7 @@ with pkgs;
emscripten = callPackage ../development/compilers/emscripten { };

emscriptenfastcomp-unwrapped = callPackage ../development/compilers/emscripten-fastcomp { };
emscriptenfastcomp-wrapped = wrapCCWith ccWrapperFun stdenv.cc.libc ''
emscriptenfastcomp-wrapped = wrapCCWith stdenv.cc.libc ''
# hardening flags break WASM support
cat > $out/nix-support/add-hardening.sh
'' emscriptenfastcomp-unwrapped;
Expand Down Expand Up @@ -4885,7 +4885,7 @@ with pkgs;

clangSelf = clangWrapSelf llvmPackagesSelf.clang;

clangWrapSelf = build: callPackage ../build-support/cc-wrapper {
clangWrapSelf = build: ccWrapperFun {
cc = build;
isClang = true;
stdenv = clangStdenv;
Expand Down Expand Up @@ -4954,8 +4954,8 @@ with pkgs;
extraBuildCommands = ''
echo "dontMoveLib64=1" >> $out/nix-support/setup-hook
'';
in wrapCCWith (callPackage ../build-support/cc-wrapper) glibc_multi extraBuildCommands (cc.cc.override {
stdenv = overrideCC stdenv (wrapCCWith (callPackage ../build-support/cc-wrapper) glibc_multi "" cc.cc);
in wrapCCWith glibc_multi extraBuildCommands (cc.cc.override {
stdenv = overrideCC stdenv (wrapCCWith glibc_multi "" cc.cc);
profiledCompiler = false;
enableMultilib = true;
}))
Expand Down Expand Up @@ -5713,7 +5713,7 @@ with pkgs;

wla-dx = callPackage ../development/compilers/wla-dx { };

wrapCCWith = ccWrapper: libc: extraBuildCommands: baseCC: ccWrapper {
wrapCCWith = libc: extraBuildCommands: baseCC: ccWrapperFun {
nativeTools = stdenv.cc.nativeTools or false;
nativeLibc = stdenv.cc.nativeLibc or false;
nativePrefix = stdenv.cc.nativePrefix or "";
Expand All @@ -5726,7 +5726,7 @@ with pkgs;

ccWrapperFun = callPackage ../build-support/cc-wrapper;

wrapCC = wrapCCWith ccWrapperFun stdenv.cc.libc "";
wrapCC = wrapCCWith stdenv.cc.libc "";
# legacy version, used for gnat bootstrapping
wrapGCC-old = baseGCC: callPackage ../build-support/gcc-wrapper-old {
nativeTools = stdenv.cc.nativeTools or false;
Expand Down