Add configure/CMake flags for conditionally building subzero targets.

pnacl/build.sh

Index: pnacl/build.sh
diff --git a/pnacl/build.sh b/pnacl/build.sh
index 04fc121c42cac51f7ab978c4fa7f336d0fdd92bb..e916f009153796bdedc2af4f7acc6f9dd6666852 100755
--- a/pnacl/build.sh
+++ b/pnacl/build.sh
@@ -304,12 +304,25 @@ llvm-sb-configure() {
   local objdir="${LLVM_SB_OBJDIR}"
   local installdir="$(GetTranslatorInstallDir ${arch})"
   local targets=""
+  local subzero_targets=""

[Jim Stichnoth, 2015/04/17 22:28:44]

Since we all love writing compact bash scripts, how about this instead of the
case statement:

declare -A targets=( [i686]=x86 [x86_64]=x86 [armv7]=arm \
                     [universal]=x86,arm )
declare -A subzero_targets=( [i686]=X8632 [x86_64]=X8664 [armv7]=ARM32 \
                             [universal]=X8632,ARM32 )

And below:
  --enable-targets=${targets[$arch]} \
  --enable-subzero-targets=${subzero_targets[$arch]} \

You're welcome.

   # For LLVM, "x86" brings in both i686 and x86_64.
   case ${arch} in
-    i686) targets=x86 ;;
-    x86_64) targets=x86 ;;
-    armv7) targets=arm ;;
-    universal) targets=x86,arm ;;
+    i686)
+      targets=x86
+      subzero_targets=X8632
+      ;;
+    x86_64)
+      targets=x86
+      subzero_targets=X8664
+      ;;
+    armv7)
+      targets=arm
+      subzero_targets=ARM32
+      ;;
+    universal)
+      targets=x86,arm
+      subzero_targets=X8632,ARM32
+      ;;
   esac
 
   spushd "${objdir}"
@@ -328,6 +341,7 @@ llvm-sb-configure() {
         --prefix=${installdir} \
         --host=nacl \
         --enable-targets=${targets} \
+        --enable-subzero-targets=${subzero_targets} \
         --disable-assertions \
         --enable-pic=no \
         --enable-static \