unix: start to define target flags in YAML config

As part of moving static configs out of code so things are easier
to reason about.

Author: indygreg

cpython-unix/build.py

@@ -95,8 +95,8 @@ def add_target_env(env, build_platform, target_triple, build_env):
     env["PYBUILD_PLATFORM"] = build_platform
     env["TOOLS_PATH"] = build_env.tools_path
 
-    extra_target_cflags = []
-    extra_target_ldflags = []
+    extra_target_cflags = list(settings.get("target_cflags", []))
+    extra_target_ldflags = list(settings.get("target_ldflags", []))
     extra_host_cflags = []
     extra_host_ldflags = []
 
@@ -109,10 +109,6 @@ def add_target_env(env, build_platform, target_triple, build_env):
         else:
             env["TARGET_TRIPLE"] = target_triple
 
-        if target_triple == "i686-unknown-linux-gnu":
-            extra_target_cflags.append("-m32")
-            extra_target_ldflags.append("-m32")
-
     if build_platform == "macos":
         machine = platform.machine()
 
@@ -125,7 +121,6 @@ def add_target_env(env, build_platform, target_triple, build_env):
 
         if target_triple == "aarch64-apple-darwin":
             env["TARGET_TRIPLE"] = "aarch64-apple-darwin"
-            arches = ["arm64"]
             sdk_platform = "macosx"
             min_version_flags = [
                 "-mmacosx-version-min=%s" % MACOSX_DEPLOYMENT_TARGET_ARM
@@ -135,49 +130,42 @@ def add_target_env(env, build_platform, target_triple, build_env):
             env["TARGET_TRIPLE"] = "aarch64-apple-ios"
             # TODO arm64e not supported by open source Clang.
             # TODO add arm7 / arm7s?
-            arches = ["arm64"]
             sdk_platform = "iphoneos"
             min_version_flags = ["-mios-version-min=%s" % IPHONEOS_DEPLOYMENT_TARGET]
             env["APPLE_MIN_DEPLOYMENT_TARGET"] = IPHONEOS_DEPLOYMENT_TARGET
         elif target_triple == "arm64-apple-tvos":
             env["TARGET_TRIPLE"] = "arm64-apple-tvos"
-            arches = ["arm64"]
             sdk_platform = "appletvos"
             min_version_flags = ["-mappletvos-version-min=%s" % TVOS_DEPLOYMENT_TARGET]
             env["APPLE_MIN_DEPLOYMENT_TARGET"] = TVOS_DEPLOYMENT_TARGET
         elif target_triple == "thumbv7k-apple-watchos":
             env["TARGET_TRIPLE"] = "thumbv7k-apple-watchos"
-            arches = ["armv7k"]
             sdk_platform = "watchos"
             min_version_flags = ["-mwatchos-version-min=%s" % WATCHOS_DEPLOYMENT_TARGET]
             env["APPLE_MIN_DEPLOYMENT_TARGET"] = WATCHOS_DEPLOYMENT_TARGET
         elif target_triple == "x86_64-apple-darwin":
             env["TARGET_TRIPLE"] = "x86_64-apple-darwin"
-            arches = ["x86_64"]
             sdk_platform = "macosx"
             min_version_flags = [
                 "-mmacosx-version-min=%s" % MACOSX_DEPLOYMENT_TARGET_X86
             ]
             env["APPLE_MIN_DEPLOYMENT_TARGET"] = MACOSX_DEPLOYMENT_TARGET_X86
         elif target_triple == "x86_64-apple-ios":
             env["TARGET_TRIPLE"] = "x86_64-apple-ios"
-            arches = ["x86_64"]
             sdk_platform = "iphonesimulator"
             min_version_flags = [
                 "-mios-simulator-version-min=%s" % IPHONEOS_DEPLOYMENT_TARGET,
             ]
             env["APPLE_MIN_DEPLOYMENT_TARGET"] = IPHONEOS_DEPLOYMENT_TARGET
         elif target_triple == "x86_64-apple-tvos":
             env["TARGET_TRIPLE"] = "x86_64-apple-tvos"
-            arches = ["x86_64"]
             sdk_platform = "appletvsimulator"
             min_version_flags = [
                 "-mappletvsimulator-version-min=%s" % TVOS_DEPLOYMENT_TARGET
             ]
             env["APPLE_MIN_DEPLOYMENT_TARGET"] = TVOS_DEPLOYMENT_TARGET
         elif target_triple == "x86_64-apple-watchos":
             env["TARGET_TRIPLE"] = "x86_64-apple-watchos"
-            arches = ["x86_64"]
             sdk_platform = "watchsimulator"
             min_version_flags = [
                 "-mwatchsimulator-version-min=%s" % WATCHOS_DEPLOYMENT_TARGET
@@ -203,10 +191,6 @@ def add_target_env(env, build_platform, target_triple, build_env):
             ]
         )
 
-        for arch in arches:
-            extra_target_cflags.extend(["-arch", arch])
-            extra_target_ldflags.extend(["-arch", arch])
-
         if "APPLE_SDK_PATH" in os.environ:
             sdk_path = os.environ["APPLE_SDK_PATH"]
         else:

cpython-unix/targets.yml

@@ -17,10 +17,19 @@
 #    current build environment.
 #
 # target_cc
-#
 #    Path to C compiler to use for building binaries targeting the
 #    target architecture.
 #
+# target_cflags
+#    List of extra compiler flags to use when building for the target.
+#
+#    Values will be added to CPPFLAGS and CFLAGS.
+#
+# target_ldflags
+#    List of extra linker flags to use when building for the target.
+#
+#    Values will be added to LDFLAGS.
+#
 # openssl_target
 #    Name of OpenSSL platform build target.
 
@@ -31,6 +40,12 @@ aarch64-apple-darwin:
   needs_toolchain: true
   host_cc: clang
   target_cc: clang
+  target_cflags:
+    - '-arch'
+    - 'arm64'
+  target_ldflags:
+    - '-arch'
+    - 'arm64'
   needs:
     - bzip2
     - libedit
@@ -51,6 +66,12 @@ aarch64-apple-ios:
   needs_toolchain: true
   host_cc: clang
   target_cc: clang
+  target_cflags:
+    - '-arch'
+    - 'arm64'
+  target_ldflags:
+    - '-arch'
+    - 'arm64'
   needs:
     - bzip2
     - libffi
@@ -93,6 +114,12 @@ arm64-apple-tvos:
   needs_toolchain: true
   host_cc: clang
   target_cc: clang
+  target_cflags:
+    - '-arch'
+    - 'arm64'
+  target_ldflags:
+    - '-arch'
+    - 'arm64'
   needs:
     - bzip2
     - sqlite
@@ -162,6 +189,10 @@ i686-unknown-linux-gnu:
   needs_toolchain: true
   host_cc: clang
   target_cc: clang
+  target_cflags:
+    - '-m32'
+  target_ldflags:
+    - '-m32'
   needs:
     - bdb
     - binutils
@@ -276,6 +307,12 @@ thumb7k-apple-watchos:
   needs_toolchain: true
   host_cc: clang
   target_cc: clang
+  target_cflags:
+    - '-arch'
+    - 'armv7k'
+  target_ldflags:
+    - '-arch'
+    - 'armv7k'
   needs:
     - bzip2
     - sqlite
@@ -288,6 +325,12 @@ x86_64-apple-darwin:
     - darwin
   host_cc: clang
   target_cc: clang
+  target_cflags:
+    - '-arch'
+    - 'x86_64'
+  target_ldflags:
+    - '-arch'
+    - 'x86_64'
   needs:
     - bzip2
     - libedit
@@ -308,6 +351,12 @@ x86_64-apple-ios:
   needs_toolchain: true
   host_cc: clang
   target_cc: clang
+  target_cflags:
+    - '-arch'
+    - 'x86_64'
+  target_ldflags:
+    - '-arch'
+    - 'x86_64'
   needs:
     - bzip2
     - libffi
@@ -322,6 +371,12 @@ x86_64-apple-tvos:
   needs_toolchain: true
   host_cc: clang
   target_cc: clang
+  target_cflags:
+    - '-arch'
+    - 'x86_64'
+  target_ldflags:
+    - '-arch'
+    - 'x86_64'
   needs:
     - bzip2
     - sqlite
@@ -334,6 +389,12 @@ x86_64-apple-watchos:
   needs_toolchain: true
   host_cc: clang
   target_cc: clang
+  target_cflags:
+    - '-arch'
+    - 'x86_64'
+  target_ldflags:
+    - '-arch'
+    - 'x86_64'
   needs:
     - bzip2
     - sqlite