diff options
Diffstat (limited to 'pkgs/development/tools/build-managers/bazel/cpp-test.nix')
-rw-r--r-- | pkgs/development/tools/build-managers/bazel/cpp-test.nix | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/pkgs/development/tools/build-managers/bazel/cpp-test.nix b/pkgs/development/tools/build-managers/bazel/cpp-test.nix index 3f3faae25e2e..2286ed690bdc 100644 --- a/pkgs/development/tools/build-managers/bazel/cpp-test.nix +++ b/pkgs/development/tools/build-managers/bazel/cpp-test.nix @@ -2,7 +2,8 @@ bazel , bazelTest , bazel-examples -, gccStdenv +, stdenv +, darwin , lib , runLocal , runtimeShell @@ -16,9 +17,10 @@ let toolsBazel = writeScript "bazel" '' #! ${runtimeShell} - export CXX='${gccStdenv.cc}/bin/g++' - export LD='${gccStdenv.cc}/bin/ld' - export CC='${gccStdenv.cc}/bin/gcc' + export CXX='${stdenv.cc}/bin/clang++' + export LD='${darwin.cctools}/bin/ld' + export LIBTOOL='${darwin.cctools}/bin/libtool' + export CC='${stdenv.cc}/bin/clang' # XXX: hack for macosX, this flags disable bazel usage of xcode # See: https://github.com/bazelbuild/bazel/issues/4231 @@ -31,7 +33,7 @@ let cp -r ${bazel-examples}/cpp-tutorial/stage3 $out find $out -type d -exec chmod 755 {} \; '' - + (lib.optionalString gccStdenv.isDarwin '' + + (lib.optionalString stdenv.isDarwin '' mkdir $out/tools cp ${toolsBazel} $out/tools/bazel '')); @@ -46,7 +48,10 @@ let --distdir=${distDir} \ --curses=no \ --sandbox_debug \ - //... + //... \ + '' + lib.optionalString (stdenv.isDarwin) '' + --cxxopt=-x --cxxopt=c++ --host_cxxopt=-x --host_cxxopt=c++ \ + --linkopt=-stdlib=libc++ --host_linkopt=-stdlib=libc++ \ ''; }; |