diff options
-rw-r--r-- | .gitignore | 10 | ||||
-rwxr-xr-x | compile.sh | 6 | ||||
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/testutil/FoundationTestCase.java | 2 | ||||
-rw-r--r-- | tools/BUILD (renamed from base_workspace/tools/BUILD) | 0 | ||||
-rw-r--r-- | tools/build_rules/genproto.bzl (renamed from base_workspace/tools/build_rules/genproto.bzl) | 0 | ||||
-rw-r--r-- | tools/build_rules/go_rules.bzl (renamed from base_workspace/tools/build_rules/go_rules.bzl) | 0 | ||||
-rw-r--r-- | tools/build_rules/java_rules_oss.bzl (renamed from base_workspace/tools/build_rules/java_rules_oss.bzl) | 0 | ||||
-rw-r--r-- | tools/build_rules/py_rules.bzl (renamed from base_workspace/tools/build_rules/py_rules.bzl) | 0 | ||||
-rw-r--r-- | tools/cpp/BUILD (renamed from base_workspace/tools/cpp/BUILD) | 2 | ||||
-rw-r--r-- | tools/cpp/CROSSTOOL (renamed from base_workspace/tools/cpp/CROSSTOOL) | 0 | ||||
-rw-r--r-- | tools/cpp/empty.cc (renamed from base_workspace/tools/cpp/empty.cc) | 0 | ||||
-rw-r--r-- | tools/defaults/BUILD (renamed from base_workspace/tools/defaults/BUILD) | 0 | ||||
-rw-r--r-- | tools/genrule/BUILD (renamed from base_workspace/tools/genrule/BUILD) | 0 | ||||
-rwxr-xr-x | tools/genrule/genrule-setup.sh (renamed from base_workspace/tools/genrule/genrule-setup.sh) | 0 | ||||
-rw-r--r-- | tools/go/BUILD (renamed from base_workspace/tools/go/BUILD) | 0 | ||||
-rw-r--r-- | tools/go/generate_test_main.go (renamed from base_workspace/tools/go/generate_test_main.go) | 0 | ||||
-rw-r--r-- | tools/jdk/BUILD (renamed from base_workspace/tools/jdk/BUILD) | 0 | ||||
-rw-r--r-- | tools/test/BUILD (renamed from base_workspace/tools/test/BUILD) | 0 | ||||
-rwxr-xr-x | tools/test/test-setup.sh (renamed from base_workspace/tools/test/test-setup.sh) | 0 |
19 files changed, 10 insertions, 10 deletions
diff --git a/.gitignore b/.gitignore index e340510bee..daa603d63d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,8 @@ /output/ /bazel-* /fromhost/ -/base_workspace/tools/jdk/jdk -/base_workspace/tools/java/ijar -/base_workspace/tools/java/JavaBuilder_deploy.jar -/base_workspace/tools/java/SingleJar_deploy.jar -/tools +/base_workspace/tools/ +/tools/jdk/jdk +/tools/java/ijar +/tools/java/JavaBuilder_deploy.jar +/tools/java/SingleJar_deploy.jar 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 ]] \ diff --git a/src/test/java/com/google/devtools/build/lib/testutil/FoundationTestCase.java b/src/test/java/com/google/devtools/build/lib/testutil/FoundationTestCase.java index 8c80d7d99d..3302d33f7f 100644 --- a/src/test/java/com/google/devtools/build/lib/testutil/FoundationTestCase.java +++ b/src/test/java/com/google/devtools/build/lib/testutil/FoundationTestCase.java @@ -91,7 +91,7 @@ public abstract class FoundationTestCase extends ChattyAssertsTestCase { scratchFile(rootDirectory.getRelative("devtools/blaze/rules/BUILD").getPathString()); scratchFile(rootDirectory.getRelative("rules/BUILD").getPathString()); copySkylarkFilesIfExist("devtools/blaze/rules/staging", "devtools/blaze/rules/staging"); - copySkylarkFilesIfExist("devtools/blaze/bazel/base_workspace/tools/build_rules", "rules"); + copySkylarkFilesIfExist("devtools/blaze/bazel/tools/build_rules", "rules"); } private void copySkylarkFilesIfExist(String from, String to) throws IOException { diff --git a/base_workspace/tools/BUILD b/tools/BUILD index ffd0fb0cdc..ffd0fb0cdc 100644 --- a/base_workspace/tools/BUILD +++ b/tools/BUILD diff --git a/base_workspace/tools/build_rules/genproto.bzl b/tools/build_rules/genproto.bzl index 14801e3c93..14801e3c93 100644 --- a/base_workspace/tools/build_rules/genproto.bzl +++ b/tools/build_rules/genproto.bzl diff --git a/base_workspace/tools/build_rules/go_rules.bzl b/tools/build_rules/go_rules.bzl index ae218ccd39..ae218ccd39 100644 --- a/base_workspace/tools/build_rules/go_rules.bzl +++ b/tools/build_rules/go_rules.bzl diff --git a/base_workspace/tools/build_rules/java_rules_oss.bzl b/tools/build_rules/java_rules_oss.bzl index dcd2329ebc..dcd2329ebc 100644 --- a/base_workspace/tools/build_rules/java_rules_oss.bzl +++ b/tools/build_rules/java_rules_oss.bzl diff --git a/base_workspace/tools/build_rules/py_rules.bzl b/tools/build_rules/py_rules.bzl index ddd43df75d..ddd43df75d 100644 --- a/base_workspace/tools/build_rules/py_rules.bzl +++ b/tools/build_rules/py_rules.bzl diff --git a/base_workspace/tools/cpp/BUILD b/tools/cpp/BUILD index b3f32c9609..af72b660ea 100644 --- a/base_workspace/tools/cpp/BUILD +++ b/tools/cpp/BUILD @@ -21,8 +21,8 @@ filegroup( filegroup( name = "toolchain", srcs = [ - ":cc-compiler-local", ":cc-compiler-darwin", + ":cc-compiler-local", ":empty", ], ) diff --git a/base_workspace/tools/cpp/CROSSTOOL b/tools/cpp/CROSSTOOL index 7287bc49ba..7287bc49ba 100644 --- a/base_workspace/tools/cpp/CROSSTOOL +++ b/tools/cpp/CROSSTOOL diff --git a/base_workspace/tools/cpp/empty.cc b/tools/cpp/empty.cc index 7309f1cff2..7309f1cff2 100644 --- a/base_workspace/tools/cpp/empty.cc +++ b/tools/cpp/empty.cc diff --git a/base_workspace/tools/defaults/BUILD b/tools/defaults/BUILD index fab37b3da7..fab37b3da7 100644 --- a/base_workspace/tools/defaults/BUILD +++ b/tools/defaults/BUILD diff --git a/base_workspace/tools/genrule/BUILD b/tools/genrule/BUILD index 318ebb0410..318ebb0410 100644 --- a/base_workspace/tools/genrule/BUILD +++ b/tools/genrule/BUILD diff --git a/base_workspace/tools/genrule/genrule-setup.sh b/tools/genrule/genrule-setup.sh index e69de29bb2..e69de29bb2 100755 --- a/base_workspace/tools/genrule/genrule-setup.sh +++ b/tools/genrule/genrule-setup.sh diff --git a/base_workspace/tools/go/BUILD b/tools/go/BUILD index de99b06eac..de99b06eac 100644 --- a/base_workspace/tools/go/BUILD +++ b/tools/go/BUILD diff --git a/base_workspace/tools/go/generate_test_main.go b/tools/go/generate_test_main.go index 6316802dde..6316802dde 100644 --- a/base_workspace/tools/go/generate_test_main.go +++ b/tools/go/generate_test_main.go diff --git a/base_workspace/tools/jdk/BUILD b/tools/jdk/BUILD index 89241c1aa5..89241c1aa5 100644 --- a/base_workspace/tools/jdk/BUILD +++ b/tools/jdk/BUILD diff --git a/base_workspace/tools/test/BUILD b/tools/test/BUILD index db26d3bb78..db26d3bb78 100644 --- a/base_workspace/tools/test/BUILD +++ b/tools/test/BUILD diff --git a/base_workspace/tools/test/test-setup.sh b/tools/test/test-setup.sh index 35bb6c6284..35bb6c6284 100755 --- a/base_workspace/tools/test/test-setup.sh +++ b/tools/test/test-setup.sh |