diff --git a/build.sh b/build.sh
index 4fed7989a657b7859fbcb795f589345d7acbf5be..7b6b7908abbd185a34239ff96f5050a0c51b36d0 100755
--- a/build.sh
+++ b/build.sh
@@ -7,11 +7,15 @@ CXX_COMPILER_PATH=g++
 # Initialize our own variables:
 buildtype=RelWithDebInfo
 backends="ARM;AArch64;X86"
+enabled_projects="clang;lld;compiler-rt;openmp;clang-tools-extra"
+embedded_toolchain="0"
 split_dwarf=on
 use_ccache="0"
 do_install="0"
 clean=0
 unit_test=""
+install="install"
+install_toolchain_only="0"
 verbose=""
 dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
 build_dir_name="build"
@@ -38,16 +42,19 @@ usage() {
   cat <<EOF
 Usage: $0 [options]
 
-Build the compiler under $(get_relative_path $build_prefix), then install under $(get_relative_path $install_prefix) .
+Build the compiler under $build_prefix, then install under $install_prefix.
 
 Options:
   -b type  Specify CMake build type (default: $buildtype).
   -c       Use ccache (default: $use_ccache).
+  -e       Build for embedded cross tool chain.
   -h       Display this help message.
   -i       Install the build (default: $do_install).
   -I name  Specify install directory name (default: "$install_dir_name").
   -j N     Allow N jobs at once (default: $threads).
-  -r       Delete $(get_relative_path $install_prefix) and perform a clean build (default: incremental).
+  -o       Enable LLVM_INSTALL_TOOLCHAIN_ONLY=ON.
+  -r       Delete $install_prefix and perform a clean build (default: incremental).
+  -s       Strip binaries and minimize file permissions when (re-)installing.
   -t       Enable unit tests for components that support them (make check-all).
   -v       Enable verbose build output (default: quiet).
   -X archs Build only the specified semi-colon-delimited list of backends (default: "$backends").
@@ -56,7 +63,7 @@ EOF
 
 # Process command-line options. Remember the options for passing to the
 # containerized build script.
-while getopts :b:chiI:j:rtvX: optchr; do
+while getopts :b:cehiI:j:orstvX: optchr; do
   case "$optchr" in
     b)
       buildtype="$OPTARG"
@@ -75,6 +82,9 @@ while getopts :b:chiI:j:rtvX: optchr; do
     c)
       use_ccache="1"
       ;;
+    e)
+      embedded_toolchain="1"
+      ;;
     h)
       usage
       exit
@@ -89,9 +99,15 @@ while getopts :b:chiI:j:rtvX: optchr; do
     j)
       threads="$OPTARG"
       ;;
+    o)
+      install_toolchain_only=1
+      ;;
     r)
       clean=1
       ;;
+    s)
+      install="install/strip"
+      ;;
     t)
       unit_test=check-all
       ;;
@@ -120,7 +136,6 @@ CMAKE_OPTIONS="-DCMAKE_INSTALL_PREFIX=$install_prefix \
 
 # Warning: the -DLLVM_ENABLE_PROJECTS option is specified with cmake
 # to avoid issues with nested quotation marks
-
 if [ $use_ccache == "1" ]; then
   echo "Build using ccache"
   CMAKE_OPTIONS="$CMAKE_OPTIONS \
@@ -128,6 +143,18 @@ if [ $use_ccache == "1" ]; then
                 -DCMAKE_CXX_COMPILER_LAUNCHER=ccache "
 fi
 
+if [ $embedded_toolchain == "1" ]; then
+  echo "Build for embedded cross tool chain"
+  enabled_projects="clang;lld;compiler-rt;"
+fi
+
+# When set LLVM_INSTALL_TOOLCHAIN_ONLY to On it removes many of the LLVM development
+# and testing tools as well as component libraries from the default install target.
+if [ $install_toolchain_only == "1" ]; then
+  echo "Only install toolchain"
+  CMAKE_OPTIONS="$CMAKE_OPTIONS -DLLVM_INSTALL_TOOLCHAIN_ONLY=ON"
+fi
+
 # Build and install
 if [ $clean -eq 1 -a -e "$install_prefix" ]; then
   rm -rf "$install_prefix"
@@ -141,7 +168,8 @@ fi
 mkdir -p "$build_prefix" && cd "$build_prefix"
 cmake $CMAKE_OPTIONS \
       -DCOMPILER_RT_BUILD_SANITIZERS=on \
-      -DLLVM_ENABLE_PROJECTS="clang;compiler-rt;libunwind;lld;openmp;clang-tools-extra" \
+      -DLLVM_ENABLE_PROJECTS=$enabled_projects \
+      -DLLVM_ENABLE_RUNTIMES="libcxx;libcxxabi;libunwind" \
       -DLLVM_USE_LINKER=gold \
       -DLLVM_LIT_ARGS="-sv -j$threads" \
       -DLLVM_USE_SPLIT_DWARF=$split_dwarf \
@@ -152,7 +180,7 @@ cmake $CMAKE_OPTIONS \
 
 make -j$threads
 if [ $do_install == "1" ]; then
-  make -j$threads $verbose install
+  make -j$threads $verbose $install
 fi
 
 if [ -n "$unit_test" ]; then
@@ -161,4 +189,10 @@ fi
 
 cd ..
 
+# When building official deliverables, minimize file permissions under the
+# installation directory.
+if [ "$install" = "install/strip" ]; then
+  find $install_prefix -type f -exec chmod a-w,o-rx {} \;
+fi
+
 echo "$0: SUCCESS"