bazel_7: darwin (sandbox) fixes
This commit is contained in:
parent
7dd831bac7
commit
207fb75488
2 changed files with 7 additions and 6 deletions
|
@ -75,15 +75,15 @@ let
|
|||
}
|
||||
''
|
||||
# Bazel needs a real home for self-extraction and internal cache
|
||||
export HOME=$(mktemp -d)
|
||||
mkdir bazel_home
|
||||
export HOME=$PWD/bazel_home
|
||||
|
||||
${# Concurrent bazel invocations have the same workspace path.
|
||||
# On darwin, for some reason, it means they access and corrupt the same execroot.
|
||||
# Having a different workspace path ensures we use different execroots.
|
||||
# A different user seems to be enough for a different bazel cache root.
|
||||
# On darwin, for some reason, it means they access and corrupt the
|
||||
# same outputRoot, outputUserRoot and outputBase
|
||||
# Ensure they use build-local outputRoot by setting TEST_TMPDIR
|
||||
lib.optionalString isDarwin ''
|
||||
export USER=$(basename $HOME)
|
||||
# cd $(mktemp --tmpdir=. -d)
|
||||
export TEST_TMPDIR=$HOME/.cache/bazel
|
||||
''
|
||||
}
|
||||
${# Speed-up tests by caching bazel extraction.
|
||||
|
|
|
@ -53,6 +53,7 @@ let
|
|||
'' + lib.optionalString (stdenv.isDarwin) ''
|
||||
--cxxopt=-x --cxxopt=c++ --host_cxxopt=-x --host_cxxopt=c++ \
|
||||
--linkopt=-stdlib=libc++ --host_linkopt=-stdlib=libc++ \
|
||||
'' + lib.optionalString (stdenv.isDarwin && Foundation != null) ''
|
||||
--linkopt=-Wl,-F${Foundation}/Library/Frameworks \
|
||||
--linkopt=-L${darwin.libobjc}/lib \
|
||||
'';
|
||||
|
|
Loading…
Reference in a new issue