Pass the correct INSTALL_DIR location to docker run (#11)

Do not choose INSTALL_DIR automatically based on the availability of
the TOOLCHAIN_BUILD_IN_DOCKER environment variable. While setting that
marker variable in Dockerfile works transparently for most of the
scripts, it does not work for build.sh launcher.

This commit fixes `docker run` being invoked with

    --tmpfs "$HOST_BUILD_INSTALL_DIR:rw,exec,size=2G"

argument instead of the intended one:

    --tmpfs "$DOCKER_BUILD_INSTALL_DIR:rw,exec,size=2G"

Author: atrosinenko

Dockerfile.builder

@@ -22,8 +22,6 @@ RUN    apt-get update \
 
 ARG REPO_ROOT
 
-ENV TOOLCHAIN_BUILD_IN_DOCKER=1
-
 COPY cmake   /${REPO_ROOT}/cmake
 COPY scripts /${REPO_ROOT}/scripts
 COPY config  /${REPO_ROOT}

build.sh

@@ -92,7 +92,7 @@ build_in_docker() {
       --volume "$ROOT/output:$OUTPUT_DIR:rw" \
       --volume "$ROOT/ccache:$CCACHE_DIR:rw" \
       --volume "$ROOT/src:$SRC_DIR:ro" \
-      --tmpfs "$INSTALL_DIR:rw,exec,size=2G" \
+      --tmpfs "$DOCKER_BUILD_INSTALL_DIR:rw,exec,size=2G" \
       --tmpfs "$BUILD_TMP:rw,exec,size=5G" \
       "$DOCKER_IMAGE_NAME" "$REPO_ROOT/scripts/build-in-docker.sh"
 }
@@ -101,6 +101,7 @@ build_on_host() {
   REPO_ROOT="$ROOT"
   . ./config
   . ./scripts/global-vars
+  export INSTALL_DIR="$HOST_BUILD_INSTALL_DIR"
 
   check_repo_sha "$ROOT/src/llvm" "$LLVM_SHA"
   check_repo_sha "$ROOT/src/musl" "$MUSL_SHA"

scripts/build-in-docker.sh

@@ -10,6 +10,7 @@ cd "$(dirname "$0")"
 export REPO_ROOT="$(pwd)/.."
 . ../config
 . ./global-vars
+export INSTALL_DIR="$DOCKER_BUILD_INSTALL_DIR"
 
 if ! ./build-all.sh; then
   echo "Containerized build failed - $BUILD_TMP is discarded automatically."

scripts/global-vars

@@ -28,13 +28,6 @@ if [ "x$REPO_ROOT" != "x" ]; then
   CMAKE_DIR="$REPO_ROOT/cmake"
 fi
 
-# TOOLCHAIN_BUILD_IN_DOCKER is defined in Dockerfile.builder
-if [ -n "$TOOLCHAIN_BUILD_IN_DOCKER" ]; then
-  INSTALL_DIR="$DOCKER_BUILD_INSTALL_DIR"
-else
-  INSTALL_DIR="$HOST_BUILD_INSTALL_DIR"
-fi
-
 # Linux kernel version to be used to provide user-space headers to libc.
 # Any recent version should work, so this variable is defined here instead
 # of $REPO_ROOT/config.