diff options
| author |  Kristina Chodorow <kchodorow@google.com> | 2015-02-19 18:28:40 +0000 |
|---|---|---|
| committer |  Han-Wen Nienhuys <hanwen@google.com> | 2015-02-19 18:28:40 +0000 |
| commit | 3671ff634e85e5c3307f37e7c86d88bdf7bf911b (patch) | |
| tree | fdbdf561be80588f69c0866959b8db4b316db9e7 /compile.sh | |
| parent | 8af211fbae32910d2d3ea20fd3cfa651ea8df49b (diff) | |
Add symlinks to third_party/ and tools/ to base_workspace
While attempting to clean up the Bazel examples, I noticed that the example
tests don't actually work because they expect a third_party directory. We could
link third_party/ from the top-level bazel directory, but then we'd have
crossing symlinks (base_workspace/tools->tools and
third_party->base_workspace/third_party). Linking everything in one direction
seemed like a better option, but alternative suggestions are welcome.
--
MOS_MIGRATED_REVID=86703332
Diffstat (limited to 'compile.sh')
| -rwxr-xr-x | compile.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/compile.sh b/compile.sh index 87eb5b8ba9..fde544c354 100755 --- a/compile.sh +++ b/compile.sh @@ -64,8 +64,9 @@ function log() { fi } -# Create a tools symlink so we can run the Bazel bootstrap. -rm -f tools && ln -s base_workspace/tools tools +# Create symlinks so we can use tools from the base_workspace. +rm -f base_workspace/tools && ln -s $(pwd)/tools base_workspace/tools +rm -f base_workspace/third_party && ln -s $(pwd)/third_party base_workspace/third_party mkdir -p fromhost cat << EOF > fromhost/BUILD @@ -181,7 +182,6 @@ esac test -z "$JAVA_HOME" && fail "JDK not found, please set \$JAVA_HOME." rm -f tools/jdk/jdk && ln -s "${JAVA_HOME}" tools/jdk/jdk - JAVAC="${JAVA_HOME}/bin/javac" [[ -x $JAVAC ]] \ |