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

bazel: use llvm6 on darwin

Browse Source 
https://hydra.nixos.org/build/92942635
This commit is contained in:
Matthew Bauer 2019-05-04 00:45:26 -04:00
parent 2c89c24015
commit 81a9b46ee8
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/tools/build-managers/bazel/default.nix
View File

@ -153,7 +153,7 @@ stdenv.mkDerivation rec {
sed -i -e 's/<.*\*>//g' tools/osx/xcode_locator.m sed -i -e 's/<.*\*>//g' tools/osx/xcode_locator.m
# don't use system installed Xcode to run clang, use Nix clang instead # don't use system installed Xcode to run clang, use Nix clang instead
sed -i -e "s;/usr/bin/xcrun clang;${clang}/bin/clang $NIX_CFLAGS_COMPILE $NIX_LDFLAGS -framework CoreFoundation;g" \ sed -i -e "s;/usr/bin/xcrun clang;${stdenv.cc}/bin/clang $NIX_CFLAGS_COMPILE $NIX_LDFLAGS -framework CoreFoundation;g" \
scripts/bootstrap/compile.sh \ scripts/bootstrap/compile.sh \
src/tools/xcode/realpath/BUILD \ src/tools/xcode/realpath/BUILD \
src/tools/xcode/stdredirect/BUILD \ src/tools/xcode/stdredirect/BUILD \
@ -256,7 +256,7 @@ stdenv.mkDerivation rec {
makeWrapper makeWrapper
which which
customBash customBash
] ++ lib.optionals (stdenv.isDarwin) [ cctools clang libcxx CoreFoundation CoreServices Foundation ]; ] ++ lib.optionals (stdenv.isDarwin) [ cctools libcxx CoreFoundation CoreServices Foundation ];
# Bazel makes extensive use of symlinks in the WORKSPACE. # Bazel makes extensive use of symlinks in the WORKSPACE.
# This causes problems with infinite symlinks if the build output is in the same location as the # This causes problems with infinite symlinks if the build output is in the same location as the

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

@ -8660,13 +8660,16 @@ in
bam = callPackage ../development/tools/build-managers/bam {}; bam = callPackage ../development/tools/build-managers/bam {};
bazel_0_4 = callPackage ../development/tools/build-managers/bazel/0.4.nix { }; bazel_0_4 = callPackage ../development/tools/build-managers/bazel/0.4.nix {
stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv;
};
bazel = callPackage ../development/tools/build-managers/bazel { bazel = callPackage ../development/tools/build-managers/bazel {
inherit (darwin) cctools; inherit (darwin) cctools;
inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Foundation; inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Foundation;
buildJdk = jdk8; buildJdk = jdk8;
buildJdkName = "jdk8"; buildJdkName = "jdk8";
runJdk = jdk11; runJdk = jdk11;
stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv;
}; };
bazel-buildtools = callPackage ../development/tools/build-managers/bazel/buildtools { }; bazel-buildtools = callPackage ../development/tools/build-managers/bazel/buildtools { };