diff options
| author |  Damien Martin-Guillerez <dmarting@google.com> | 2016-01-18 11:03:59 +0000 |
|---|---|---|
| committer |  Han-Wen Nienhuys <hanwen@google.com> | 2016-01-18 14:34:55 +0000 |
| commit | e5b7c591f44487b55a850870f5db660212402b60 (patch) | |
| tree | 761200b1b83815f4095d5df06f9a0c4f9b60e11f /scripts | |
| parent | 198a54f95e88d7547e0458aba8ab63833005b81b (diff) | |
Do not use sandboxing when bootstrapping
This simplify the bootstrap process and remove a C++ tool from
the bootstrap binary.
--
MOS_MIGRATED_REVID=112394555
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/bootstrap/bootstrap.sh | 5 | ||||
| -rwxr-xr-x | scripts/bootstrap/compile.sh | 9 |
2 files changed, 4 insertions, 10 deletions
diff --git a/scripts/bootstrap/bootstrap.sh b/scripts/bootstrap/bootstrap.sh index e0b42d6d5a..05af3583cd 100755 --- a/scripts/bootstrap/bootstrap.sh +++ b/scripts/bootstrap/bootstrap.sh @@ -35,6 +35,7 @@ fi --genclass_top=//src/java_tools/buildjar:bootstrap_genclass_deploy.jar \ --ijar_top=//third_party/ijar \ --strategy=Javac=worker --worker_quit_after_build \ + --genrule_strategy=standalone --spawn_strategy=standalone \ ${EXTRA_BAZEL_ARGS-}"} function bazel_bootstrap() { @@ -42,12 +43,12 @@ function bazel_bootstrap() { if [[ ! ${BAZEL_SKIP_TOOL_COMPILATION-} =~ "$2" ]]; then log "Building $2" if [ -n "${4-}" ]; then - ${BAZEL} --nomaster_bazelrc --bazelrc=${BAZELRC} \ + ${BAZEL} --nomaster_bazelrc --bazelrc=${BAZELRC} --batch \ build ${BAZEL_ARGS} \ --javacopt="-source ${JAVA_VERSION} -target ${JAVA_VERSION}" \ "${EMBED_LABEL_ARG[@]}" $1 else - run_silent ${BAZEL} --nomaster_bazelrc --bazelrc=${BAZELRC} \ + run_silent ${BAZEL} --nomaster_bazelrc --bazelrc=${BAZELRC} --batch \ build ${BAZEL_ARGS} \ --javacopt="-source ${JAVA_VERSION} -target ${JAVA_VERSION}" \ "${EMBED_LABEL_ARG[@]}" $1 diff --git a/scripts/bootstrap/compile.sh b/scripts/bootstrap/compile.sh index ec9739777f..37e01995f6 100755 --- a/scripts/bootstrap/compile.sh +++ b/scripts/bootstrap/compile.sh @@ -342,19 +342,12 @@ else cp src/main/tools/xcode_locator_stub.sh ${OUTPUT_DIR}/xcode-locator fi -log "Compiling namespace-sandbox..." -if [[ $PLATFORM == "linux" ]]; then - run_silent "${CC}" -o ${OUTPUT_DIR}/namespace-sandbox -std=c99 src/main/tools/namespace-sandbox.c src/main/tools/network-tools.c src/main/tools/process-tools.c -lm ${LDFLAGS} -else - run_silent "${CC}" -o ${OUTPUT_DIR}/namespace-sandbox -std=c99 src/main/tools/namespace-sandbox-dummy.c -lm ${LDFLAGS} -fi - cp src/main/tools/build_interface_so ${OUTPUT_DIR}/build_interface_so cp src/main/tools/jdk.* ${OUTPUT_DIR} log "Creating Bazel self-extracting archive..." ARCHIVE_DIR=${OUTPUT_DIR}/archive -for i in libblaze.jar ${JNILIB} build-runfiles${EXE_EXT} process-wrapper${EXE_EXT} xcode-locator${EXE_EXT} namespace-sandbox${EXE_EXT} build_interface_so ${MSYS_DLLS} jdk.BUILD; do +for i in libblaze.jar ${JNILIB} build-runfiles${EXE_EXT} process-wrapper${EXE_EXT} xcode-locator${EXE_EXT} build_interface_so ${MSYS_DLLS} jdk.BUILD; do mkdir -p $(dirname $ARCHIVE_DIR/$i); cp $OUTPUT_DIR/$i $ARCHIVE_DIR/$i; done |