public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

treewide: Less {cc,bintools}-wrapper eta expansion

Browse Source 
Also makes the LLVM ones more correct
This commit is contained in:
John Ericson
2018-05-22 19:21:35 -04:00
committed by John Ericson
parent 07d73c4ab0
commit 25e866a7fe
7 changed files with 41 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/compilers/llvm/3.7/default.nix
View File

@@ -1,5 +1,5 @@
{ newScope, stdenv, libstdcxxHook, cmake, libxml2, python2, isl, fetchurl
, overrideCC, wrapCC, ccWrapperFun, darwin
, overrideCC, wrapCCWith, darwin
}:
let
@@ -27,17 +27,13 @@ let
clang = if stdenv.cc.isGNU then self.libstdcxxClang else self.libcxxClang;
libstdcxxClang = ccWrapperFun {
libstdcxxClang = wrapCCWith {
cc = self.clang-unwrapped;
/* FIXME is this right? */
inherit (stdenv.cc) bintools libc nativeTools nativeLibc;
extraPackages = [ libstdcxxHook ];
};
libcxxClang = ccWrapperFun {
libcxxClang = wrapCCWith {
cc = self.clang-unwrapped;
/* FIXME is this right? */
inherit (stdenv.cc) bintools libc nativeTools nativeLibc;
extraPackages = [ self.libcxx self.libcxxabi ];
};

10
pkgs/development/compilers/llvm/3.8/default.nix
View File

@@ -1,4 +1,4 @@
{ newScope, stdenv, libstdcxxHook, isl, fetchurl, overrideCC, wrapCC, ccWrapperFun, darwin }:
{ newScope, stdenv, libstdcxxHook, isl, fetchurl, overrideCC, wrapCCWith, darwin }:
let
callPackage = newScope (self // { inherit stdenv isl version fetch; });
@@ -26,17 +26,13 @@ let
clang = if stdenv.cc.isGNU then self.libstdcxxClang else self.libcxxClang;
libstdcxxClang = ccWrapperFun {
libstdcxxClang = wrapCCWith {
cc = self.clang-unwrapped;
/* FIXME is this right? */
inherit (stdenv.cc) bintools libc nativeTools nativeLibc;
extraPackages = [ libstdcxxHook ];
};
libcxxClang = ccWrapperFun {
libcxxClang = wrapCCWith {
cc = self.clang-unwrapped;
/* FIXME is this right? */
inherit (stdenv.cc) bintools libc nativeTools nativeLibc;
extraPackages = [ self.libcxx self.libcxxabi ];
};

10
pkgs/development/compilers/llvm/3.9/default.nix
View File

@@ -1,4 +1,4 @@
{ newScope, stdenv, libstdcxxHook, isl, fetchurl, overrideCC, wrapCC, ccWrapperFun, darwin }:
{ newScope, stdenv, libstdcxxHook, isl, fetchurl, overrideCC, wrapCCWith, darwin }:
let
callPackage = newScope (self // { inherit stdenv isl version fetch; });
@@ -26,17 +26,13 @@ let
clang = if stdenv.cc.isGNU then self.libstdcxxClang else self.libcxxClang;
libstdcxxClang = ccWrapperFun {
libstdcxxClang = wrapCCWith {
cc = self.clang-unwrapped;
/* FIXME is this right? */
inherit (stdenv.cc) bintools libc nativeTools nativeLibc;
extraPackages = [ libstdcxxHook ];
};
libcxxClang = ccWrapperFun {
libcxxClang = wrapCCWith {
cc = self.clang-unwrapped;
/* FIXME is this right? */
inherit (stdenv.cc) bintools libc nativeTools nativeLibc;
extraPackages = [ self.libcxx self.libcxxabi ];
};

10
pkgs/development/compilers/llvm/4/default.nix
View File

@@ -1,5 +1,5 @@
{ lowPrio, newScope, stdenv, targetPlatform, cmake, libstdcxxHook
, libxml2, python2, isl, fetchurl, overrideCC, wrapCC, ccWrapperFun
, libxml2, python2, isl, fetchurl, overrideCC, wrapCCWith
, darwin
}:
@@ -40,17 +40,13 @@ let
clang = if stdenv.cc.isGNU then self.libstdcxxClang else self.libcxxClang;
libstdcxxClang = ccWrapperFun {
libstdcxxClang = wrapCCWith {
cc = self.clang-unwrapped;
/* FIXME is this right? */
inherit (stdenv.cc) bintools libc nativeTools nativeLibc;
extraPackages = [ libstdcxxHook ];
};
libcxxClang = ccWrapperFun {
libcxxClang = wrapCCWith {
cc = self.clang-unwrapped;
/* FIXME is this right? */
inherit (stdenv.cc) bintools libc nativeTools nativeLibc;
extraPackages = [ self.libcxx self.libcxxabi ];
};

10
pkgs/development/compilers/llvm/5/default.nix
View File

@@ -1,5 +1,5 @@
{ lowPrio, newScope, stdenv, targetPlatform, cmake, libstdcxxHook
, libxml2, python2, isl, fetchurl, overrideCC, wrapCC, ccWrapperFun
, libxml2, python2, isl, fetchurl, overrideCC, wrapCCWith
, darwin
}:
@@ -40,17 +40,13 @@ let
clang = if stdenv.cc.isGNU then self.libstdcxxClang else self.libcxxClang;
libstdcxxClang = ccWrapperFun {
libstdcxxClang = wrapCCWith {
cc = self.clang-unwrapped;
/* FIXME is this right? */
inherit (stdenv.cc) bintools libc nativeTools nativeLibc;
extraPackages = [ libstdcxxHook ];
};
libcxxClang = ccWrapperFun {
libcxxClang = wrapCCWith {
cc = self.clang-unwrapped;
/* FIXME is this right? */
inherit (stdenv.cc) bintools libc nativeTools nativeLibc;
extraPackages = [ self.libcxx self.libcxxabi ];
};

10
pkgs/development/compilers/llvm/6/default.nix
View File

@@ -1,5 +1,5 @@
{ lowPrio, newScope, stdenv, targetPlatform, cmake, libstdcxxHook
, libxml2, python2, isl, fetchurl, overrideCC, wrapCC, ccWrapperFun
, libxml2, python2, isl, fetchurl, overrideCC, wrapCCWith
, darwin
}:
@@ -40,17 +40,13 @@ let
clang = if stdenv.cc.isGNU then self.libstdcxxClang else self.libcxxClang;
libstdcxxClang = ccWrapperFun {
libstdcxxClang = wrapCCWith {
cc = self.clang-unwrapped;
/* FIXME is this right? */
inherit (stdenv.cc) bintools libc nativeTools nativeLibc;
extraPackages = [ libstdcxxHook ];
};
libcxxClang = ccWrapperFun {
libcxxClang = wrapCCWith {
cc = self.clang-unwrapped;
/* FIXME is this right? */
inherit (stdenv.cc) bintools libc nativeTools nativeLibc;
extraPackages = [ self.libcxx self.libcxxabi ];
};