commit f7a4795f4dc80a06e80d989108d795db6b648302
author davg <davg@google.com> Thu Jun 07 16:38:29 2018 -0400
committer David Goldman <davg@google.com> Wed Jun 13 17:26:42 2018 -0400
tree 75c4c8d389cb4049900eafdc85165c5ea74e172a
parent fcfdc5f3903a470a41b028520ee23beb4de77ff6

Fix bug when building for Generic (iOS) Device

PiperOrigin-RevId: 199687667

src/TulsiGenerator/Scripts/bazel_build.py

diff --git a/src/TulsiGenerator/Scripts/bazel_build.py b/src/TulsiGenerator/Scripts/bazel_build.py
index 1b11836..75b1262 100755
--- a/src/TulsiGenerator/Scripts/bazel_build.py
+++ b/src/TulsiGenerator/Scripts/bazel_build.py
@@ -535,12 +535,14 @@
       self.update_symbol_cache = UpdateSymbolCache()
 
     # Target architecture.  Must be defined for correct setting of
-    # the --cpu flag
-    self.arch = os.environ.get('ARCHS')
-    if not self.arch:
+    # the --cpu flag. Note that Xcode will set multiple values in
+    # ARCHS when building for a Generic Device.
+    archs = os.environ.get('ARCHS')
+    if not archs:
       _PrintXcodeError('Tulsi requires env variable ARCHS to be '
                        'set.  Please file a bug against Tulsi.')
       sys.exit(1)
+    self.arch = archs.split()[-1]
 
     # Path into which generated artifacts should be copied.
     self.built_products_dir = os.environ['BUILT_PRODUCTS_DIR']