Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 027734526554
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ee2d787cc354
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Apr 24, 2017

  1. top-level: Common subexpression elimination for cc-wrapper usage 

     - `ccWrapperFun` can be used in a few more places instead of
   duplicating its definition.

 - `ccWrapper` parameter on `wrapCC` is always substituted with
   `ccWrapperFun` so just get rid of that parameter.
    @Ericson2314
    Ericson2314 committed Apr 24, 2017
    Copy the full SHA
    bef5278 View commit details

  2. Merge pull request #25186 from obsidiansystems/ccwrapper-cse 

    top-level: common subexpression elimination for cc-wrapper usage
    @Ericson2314
    Ericson2314 authored Apr 24, 2017
    Copy the full SHA
    ee2d787 View commit details
Showing with 6 additions and 6 deletions.
  1. +6 −6 pkgs/top-level/all-packages.nix
12 changes: 6 additions & 6 deletions pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -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;
@@ -4889,7 +4889,7 @@ with pkgs;

clangSelf = clangWrapSelf llvmPackagesSelf.clang;

clangWrapSelf = build: callPackage ../build-support/cc-wrapper {
clangWrapSelf = build: ccWrapperFun {
cc = build;
isClang = true;
stdenv = clangStdenv;
@@ -4958,8 +4958,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;
}))
@@ -5717,7 +5717,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 "";
@@ -5730,7 +5730,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;