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

Merge branch 'libcxx-stdenv-attr'

Browse Source
This commit is contained in:
Shea Levy 2016-10-25 11:42:35 -04:00
commit d08db2e0d6
4 changed files with 40 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
{ newScope, stdenv, isl, fetchurl, overrideCC, wrapCC }: { newScope, stdenv, isl, fetchurl, overrideCC, wrapCC, ccWrapperFun }:
let let
callPackage = newScope (self // { inherit stdenv isl version fetch; }); callPackage = newScope (self // { inherit stdenv isl version fetch; });
@ -24,8 +24,19 @@ let
clang = wrapCC self.clang-unwrapped; clang = wrapCC self.clang-unwrapped;
libcxxClang = ccWrapperFun {
cc = self.clang-unwrapped;
isClang = true;
inherit (self) stdenv;
/* FIXME is this right? */
inherit (stdenv.cc) libc nativeTools nativeLibc;
extraPackages = [ self.libcxx self.libcxxabi ];
};
stdenv = overrideCC stdenv self.clang; stdenv = overrideCC stdenv self.clang;
libcxxStdenv = overrideCC stdenv self.libcxxClang;
lldb = callPackage ./lldb.nix {}; lldb = callPackage ./lldb.nix {};
libcxx = callPackage ./libc++ {}; libcxx = callPackage ./libc++ {};

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

@ -1,4 +1,4 @@
{ newScope, stdenv, isl, fetchurl, overrideCC, wrapCC }: { newScope, stdenv, isl, fetchurl, overrideCC, wrapCC, ccWrapperFun }:
let let
callPackage = newScope (self // { inherit stdenv isl version fetch; }); callPackage = newScope (self // { inherit stdenv isl version fetch; });
@ -24,8 +24,19 @@ let
clang = wrapCC self.clang-unwrapped; clang = wrapCC self.clang-unwrapped;
libcxxClang = ccWrapperFun {
cc = self.clang-unwrapped;
isClang = true;
inherit (self) stdenv;
/* FIXME is this right? */
inherit (stdenv.cc) libc nativeTools nativeLibc;
extraPackages = [ self.libcxx self.libcxxabi ];
};
stdenv = overrideCC stdenv self.clang; stdenv = overrideCC stdenv self.clang;
libcxxStdenv = overrideCC stdenv self.libcxxClang;
lldb = callPackage ./lldb.nix {}; lldb = callPackage ./lldb.nix {};
libcxx = callPackage ./libc++ {}; libcxx = callPackage ./libc++ {};

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

@ -1,4 +1,4 @@
{ newScope, stdenv, isl, fetchurl, overrideCC, wrapCC, darwin }: { newScope, stdenv, isl, fetchurl, overrideCC, wrapCC, darwin, ccWrapperFun }:
let let
callPackage = newScope (self // { inherit stdenv isl version fetch; }); callPackage = newScope (self // { inherit stdenv isl version fetch; });
@ -24,8 +24,19 @@ let
clang = wrapCC self.clang-unwrapped; clang = wrapCC self.clang-unwrapped;
libcxxClang = ccWrapperFun {
cc = self.clang-unwrapped;
isClang = true;
inherit (self) stdenv;
/* FIXME is this right? */
inherit (stdenv.cc) libc nativeTools nativeLibc;
extraPackages = [ self.libcxx self.libcxxabi ];
};
stdenv = overrideCC stdenv self.clang; stdenv = overrideCC stdenv self.clang;
libcxxStdenv = overrideCC stdenv self.libcxxClang;
lldb = callPackage ./lldb.nix {}; lldb = callPackage ./lldb.nix {};
libcxx = callPackage ./libc++ {}; libcxx = callPackage ./libc++ {};

6
pkgs/top-level/all-packages.nix
View File

@ -4520,7 +4520,7 @@ in
#Use this instead of stdenv to build with clang #Use this instead of stdenv to build with clang
clangStdenv = if stdenv.isDarwin then stdenv else lowPrio llvmPackages.stdenv; clangStdenv = if stdenv.isDarwin then stdenv else lowPrio llvmPackages.stdenv;
libcxxStdenv = stdenvAdapters.overrideCC stdenv (clangWrapSelf llvmPackages.clang-unwrapped); libcxxStdenv = lowPrio llvmPackages.libcxxStdenv;
clean = callPackage ../development/compilers/clean { }; clean = callPackage ../development/compilers/clean { };
@ -5247,7 +5247,9 @@ in
inherit libc extraBuildCommands; inherit libc extraBuildCommands;
}; };
wrapCC = wrapCCWith (callPackage ../build-support/cc-wrapper) stdenv.cc.libc ""; ccWrapperFun = callPackage ../build-support/cc-wrapper;
wrapCC = wrapCCWith ccWrapperFun stdenv.cc.libc "";
# legacy version, used for gnat bootstrapping # legacy version, used for gnat bootstrapping
wrapGCC-old = baseGCC: callPackage ../build-support/gcc-wrapper-old { wrapGCC-old = baseGCC: callPackage ../build-support/gcc-wrapper-old {
nativeTools = stdenv.cc.nativeTools or false; nativeTools = stdenv.cc.nativeTools or false;