Fix iOS wrong compilation target issue

Author: jsamol

common.gypi

@@ -732,18 +732,19 @@
             'conditions': [
               ['iossim!="true" and target_arch in "arm64 arm armv7s"', {
                 'xcode_settings': {
+                  'SDKROOT': 'iphoneos',
+                  'ENABLE_BITCODE': 'YES',
                   'OTHER_CFLAGS': [
                     '-fembed-bitcode'
                   ],
                   'OTHER_CPLUSPLUSFLAGS': [
                     '-fembed-bitcode'
                   ],
                 }
-              }],
-              ['target_arch=="x64" or target_arch=="ia32" or (target_arch=="arm64" and iossim=="true")', {
-                'xcode_settings': { 'SDKROOT': 'iphonesimulator' },
               }, {
-                'xcode_settings': { 'SDKROOT': 'iphoneos', 'ENABLE_BITCODE': 'YES' },
+                'xcode_settings': {
+                  'SDKROOT': 'iphonesimulator',
+                }
               }],
             ],
           }],

configure.py

@@ -2420,4 +2420,4 @@ def make_bin_override():
 if options.compile_commands_json and sys.platform == 'win32':
   os.path.isfile('./compile_commands.json') and os.unlink('./compile_commands.json')
   shutil.copy2('./out/' + config['BUILDTYPE'] + '/compile_commands.json', './compile_commands.json')
-info('configure completed successfully')
+info('configure completed successfully')

tools/gyp/pylib/gyp/generator/make.py

@@ -66,8 +66,8 @@
 def CalculateVariables(default_variables, params):
     """Calculate additional variables for use in the build (called by gyp)."""
     flavor = gyp.common.GetFlavor(params)
-    if flavor == "mac":
-        default_variables.setdefault("OS", "mac")
+    if flavor in ("mac", "ios"):
+        default_variables.setdefault("OS", flavor)
         default_variables.setdefault("SHARED_LIB_SUFFIX", ".dylib")
         default_variables.setdefault(
             "SHARED_LIB_DIR", generator_default_variables["PRODUCT_DIR"]
@@ -852,7 +852,7 @@ def Write(
         self.toolset = spec["toolset"]
 
         self.is_mac_bundle = gyp.xcode_emulation.IsMacBundle(self.flavor, spec)
-        if self.flavor == "mac":
+        if self.flavor in ("mac", "ios"):
             self.xcode_settings = gyp.xcode_emulation.XcodeSettings(spec)
         else:
             self.xcode_settings = None
@@ -1047,7 +1047,7 @@ def WriteActions(
 
             # Write the actual command.
             action_commands = action["action"]
-            if self.flavor == "mac":
+            if self.flavor in ("mac", "ios"):
                 action_commands = [
                     gyp.xcode_emulation.ExpandEnvVars(command, env)
                     for command in action_commands
@@ -1231,7 +1231,7 @@ def WriteRules(
                 # action, cd_action, and mkdirs get written to a toplevel variable
                 # called cmd_foo. Toplevel variables can't handle things that change
                 # per makefile like $(TARGET), so hardcode the target.
-                if self.flavor == "mac":
+                if self.flavor in ("mac", "ios"):
                     action = [
                         gyp.xcode_emulation.ExpandEnvVars(command, env)
                         for command in action
@@ -1404,7 +1404,7 @@ def WriteSources(
                 quoter=EscapeCppDefine,
             )
 
-            if self.flavor == "mac":
+            if self.flavor in ("mac", "ios"):
                 cflags = self.xcode_settings.GetCflags(
                     configname, arch=config.get("xcode_configuration_platform")
                 )
@@ -1423,7 +1423,7 @@ def WriteSources(
             self.WriteList(cflags_c, "CFLAGS_C_%s" % configname)
             self.WriteLn("# Flags passed to only C++ files.")
             self.WriteList(cflags_cc, "CFLAGS_CC_%s" % configname)
-            if self.flavor == "mac":
+            if self.flavor in ("mac", "ios"):
                 self.WriteLn("# Flags passed to only ObjC files.")
                 self.WriteList(cflags_objc, "CFLAGS_OBJC_%s" % configname)
                 self.WriteLn("# Flags passed to only ObjC++ files.")
@@ -1493,7 +1493,7 @@ def WriteSources(
                 "%s " % precompiled_header.GetInclude("cc") + "$(CFLAGS_$(BUILDTYPE)) "
                 "$(CFLAGS_CC_$(BUILDTYPE))"
             )
-            if self.flavor == "mac":
+            if self.flavor in ("mac", "ios"):
                 self.WriteLn(
                     "$(OBJS): GYP_OBJCFLAGS := "
                     "$(DEFS_$(BUILDTYPE)) "
@@ -1560,7 +1560,7 @@ def ComputeOutputBasename(self, spec):
         """
         assert not self.is_mac_bundle
 
-        if self.flavor == "mac" and self.type in (
+        if self.flavor in ("mac", "ios") and self.type in (
             "static_library",
             "executable",
             "shared_library",
@@ -1607,7 +1607,7 @@ def ComputeOutputBasename(self, spec):
     def _InstallImmediately(self):
         return (
             self.toolset == "target"
-            and self.flavor == "mac"
+            and self.flavor in ("mac", "ios")
             and self.type
             in ("static_library", "executable", "shared_library", "loadable_module")
         )
@@ -1705,7 +1705,7 @@ def WriteTarget(
         if self.type != "none":
             for configname in sorted(configs.keys()):
                 config = configs[configname]
-                if self.flavor == "mac":
+                if self.flavor in ("mac", "ios"):
                     ldflags = self.xcode_settings.GetLdflags(
                         configname,
                         generator_default_variables["PRODUCT_DIR"],
@@ -1740,7 +1740,7 @@ def WriteTarget(
                     library_dirs = [Sourceify(self.Absolutify(i)) for i in library_dirs]
                 ldflags += [("-L%s" % library_dir) for library_dir in library_dirs]
                 self.WriteList(ldflags, "LDFLAGS_%s" % configname)
-                if self.flavor == "mac":
+                if self.flavor in ("mac", "ios"):
                     self.WriteList(
                         self.xcode_settings.GetLibtoolflags(configname),
                         "LIBTOOLFLAGS_%s" % configname,
@@ -1749,7 +1749,7 @@ def WriteTarget(
             if libraries:
                 # Remove duplicate entries
                 libraries = gyp.common.uniquer(libraries)
-                if self.flavor == "mac":
+                if self.flavor in ("mac", "ios"):
                     libraries = self.xcode_settings.AdjustLibraries(libraries)
             self.WriteList(libraries, "LIBS")
             self.WriteLn(
@@ -1758,7 +1758,7 @@ def WriteTarget(
             )
             self.WriteLn("%s: LIBS := $(LIBS)" % QuoteSpaces(self.output_binary))
 
-            if self.flavor == "mac":
+            if self.flavor in ("mac", "ios"):
                 self.WriteLn(
                     "%s: GYP_LIBTOOLFLAGS := $(LIBTOOLFLAGS_$(BUILDTYPE))"
                     % QuoteSpaces(self.output_binary)
@@ -1767,7 +1767,7 @@ def WriteTarget(
         # Postbuild actions. Like actions, but implicitly depend on the target's
         # output.
         postbuilds = []
-        if self.flavor == "mac":
+        if self.flavor in ("mac", "ios"):
             if target_postbuilds:
                 postbuilds.append("$(TARGET_POSTBUILDS_$(BUILDTYPE))")
             postbuilds.extend(gyp.xcode_emulation.GetSpecPostbuildCommands(spec))
@@ -1877,7 +1877,7 @@ def WriteTarget(
                     "Spaces in alink input filenames not supported (%s)" % link_dep
                 )
             if (
-                self.flavor not in ("mac", "openbsd", "netbsd", "win")
+                self.flavor not in ("mac", "ios", "openbsd", "netbsd", "win")
                 and not self.is_standalone_static_library
             ):
                 if self.flavor in ("linux", "android"):
@@ -1995,7 +1995,7 @@ def WriteTarget(
             if self.flavor != "zos":
                 installable_deps.append(self.output)
             if (
-                self.flavor == "mac"
+                self.flavor in ("mac", "ios")
                 and "product_dir" not in spec
                 and self.toolset == "target"
             ):
@@ -2495,7 +2495,7 @@ def CalculateMakefilePath(build_file, base_name):
         "LINK.host": LINK_host,
         "PLI.host": PLI_host,
     }
-    if flavor == "mac":
+    if flavor in ("mac", "ios"):
         flock_command = "%s gyp-mac-tool flock" % sys.executable
         header_params.update(
             {
@@ -2673,7 +2673,7 @@ def CalculateMakefilePath(build_file, base_name):
         spec = target_dicts[qualified_target]
         configs = spec["configurations"]
 
-        if flavor == "mac":
+        if flavor in ("mac", "ios"):
             gyp.xcode_emulation.MergeGlobalXcodeSettingsToSpec(data[build_file], spec)
 
         writer = MakefileWriter(generator_flags, flavor)

tools/ios_framework_prepare.sh

@@ -65,14 +65,12 @@ build_for_arm64_device() {
     --with-intl=none \
     --cross-compiling \
     --enable-static \
-    --use_clang \
-    --ninja \
     --openssl-no-asm \
     --v8-options=--jitless \
     --without-sqlite \
     --without-node-code-cache \
     --without-node-snapshot
-  JOBS=$(getconf _NPROCESSORS_ONLN) make -j$(getconf _NPROCESSORS_ONLN)
+  make -j$(getconf _NPROCESSORS_ONLN)
 
   # Move compilation outputs
   mkdir -p $TARGET_LIBRARY_PATH/arm64-device
@@ -91,15 +89,13 @@ build_for_arm64_simulator() {
     --with-intl=none \
     --cross-compiling \
     --enable-static \
-    --use_clang \
-    --ninja \
     --openssl-no-asm \
     --v8-options=--jitless \
     --without-sqlite \
     --without-node-code-cache \
     --without-node-snapshot \
     --ios-simulator
-  JOBS=$(getconf _NPROCESSORS_ONLN) make -j$(getconf _NPROCESSORS_ONLN)
+  make -j$(getconf _NPROCESSORS_ONLN)
 
   # Move compilation outputs
   mkdir -p $TARGET_LIBRARY_PATH/arm64-simulator
@@ -118,14 +114,12 @@ build_for_x64_simulator() {
     --with-intl=none \
     --cross-compiling \
     --enable-static \
-    --use_clang \
-    --ninja \
     --openssl-no-asm \
     --v8-options=--jitless \
     --without-sqlite \
     --without-node-code-cache \
     --without-node-snapshot
-  JOBS=$(getconf _NPROCESSORS_ONLN) arch -x86_64 make -j$(getconf _NPROCESSORS_ONLN)
+  arch -x86_64 make -j$(getconf _NPROCESSORS_ONLN)
 
   # Move compilation outputs
   mkdir -p $TARGET_LIBRARY_PATH/x64-simulator