diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2020-02-22 08:52:58 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-22 08:52:58 +0100 |
| commit | e4af779056318fa830de52080dca08464d0d2bf9 (patch) | |
| tree | 0290964b441e7cbd05490afcc0bcb2a43b4b63fe /pkgs | |
| parent | fd4df0bcbb0783f3fa009aa26804c196931bffd2 (diff) | |
| parent | d1ee615f1cb48a193bbe194adced53ecb7395d8e (diff) | |
| download | nixlib-e4af779056318fa830de52080dca08464d0d2bf9.tar nixlib-e4af779056318fa830de52080dca08464d0d2bf9.tar.gz nixlib-e4af779056318fa830de52080dca08464d0d2bf9.tar.bz2 nixlib-e4af779056318fa830de52080dca08464d0d2bf9.tar.lz nixlib-e4af779056318fa830de52080dca08464d0d2bf9.tar.xz nixlib-e4af779056318fa830de52080dca08464d0d2bf9.tar.zst nixlib-e4af779056318fa830de52080dca08464d0d2bf9.zip | |
Merge pull request #80635 from marsam/fix-bazel-darwin
bazel: fix build on darwin
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/tools/build-managers/bazel/default.nix | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/pkgs/development/tools/build-managers/bazel/default.nix b/pkgs/development/tools/build-managers/bazel/default.nix index da69000a5e49..884f0253f1a5 100644 --- a/pkgs/development/tools/build-managers/bazel/default.nix +++ b/pkgs/development/tools/build-managers/bazel/default.nix @@ -326,6 +326,14 @@ stdenv.mkDerivation rec { postPatch = let darwinPatches = '' + bazelLinkFlags () { + eval set -- "$NIX_LDFLAGS" + local flag + for flag in "$@"; do + printf ' -Wl,%s' "$flag" + done + } + # Disable Bazel's Xcode toolchain detection which would configure compilers # and linkers from Xcode instead of from PATH export BAZEL_USE_CPP_ONLY_TOOLCHAIN=1 @@ -335,14 +343,14 @@ stdenv.mkDerivation rec { # Framework search paths aren't added by bintools hook # https://github.com/NixOS/nixpkgs/pull/41914 - export NIX_LDFLAGS="$NIX_LDFLAGS -F${CoreFoundation}/Library/Frameworks -F${CoreServices}/Library/Frameworks -F${Foundation}/Library/Frameworks" + export NIX_LDFLAGS+=" -F${CoreFoundation}/Library/Frameworks -F${CoreServices}/Library/Frameworks -F${Foundation}/Library/Frameworks" # libcxx includes aren't added by libcxx hook # https://github.com/NixOS/nixpkgs/pull/41589 export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -isystem ${libcxx}/include/c++/v1" # don't use system installed Xcode to run clang, use Nix clang instead - sed -i -E "s;/usr/bin/xcrun (--sdk macosx )?clang;${stdenv.cc}/bin/clang $NIX_CFLAGS_COMPILE $NIX_LDFLAGS -framework CoreFoundation;g" \ + sed -i -E "s;/usr/bin/xcrun (--sdk macosx )?clang;${stdenv.cc}/bin/clang $NIX_CFLAGS_COMPILE $(bazelLinkFlags) -framework CoreFoundation;g" \ scripts/bootstrap/compile.sh \ src/tools/xcode/realpath/BUILD \ src/tools/xcode/stdredirect/BUILD \ |