Skip to content

Commit fa7fc0d

Browse files
authored
Use get_build_target consistently (#2857)
There were still a few places in the bootstrap script that were using a hardcoded target triple. rdar://problem/63036398
1 parent 6b9f18e commit fa7fc0d

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

Utilities/bootstrap

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -454,7 +454,7 @@ def build_tsc(args):
454454

455455
cmake_flags = []
456456
if platform.system() == 'Darwin':
457-
cmake_flags.append("-DCMAKE_C_FLAGS=-target x86_64-apple-macosx%s" % g_macos_deployment_target)
457+
cmake_flags.append("-DCMAKE_C_FLAGS=-target %s%s" % (get_build_target(args), g_macos_deployment_target))
458458
cmake_flags.append("-DCMAKE_OSX_DEPLOYMENT_TARGET=%s" % g_macos_deployment_target)
459459

460460
build_with_cmake(args, cmake_flags, args.tsc_source_dir, args.tsc_build_dir)
@@ -465,7 +465,7 @@ def build_yams(args):
465465

466466
cmake_flags = []
467467
if platform.system() == 'Darwin':
468-
cmake_flags.append("-DCMAKE_C_FLAGS=-target x86_64-apple-macosx%s" % g_macos_deployment_target)
468+
cmake_flags.append("-DCMAKE_C_FLAGS=-target %s%s" % (get_build_target(args), g_macos_deployment_target))
469469
cmake_flags.append("-DCMAKE_OSX_DEPLOYMENT_TARGET=%s" % g_macos_deployment_target)
470470
else:
471471
if args.dispatch_build_dir:
@@ -486,7 +486,7 @@ def build_swift_driver(args):
486486
"-DYams_DIR=" + os.path.join(args.yams_build_dir, "cmake/modules"),
487487
]
488488
if platform.system() == 'Darwin':
489-
cmake_flags.append("-DCMAKE_C_FLAGS=-target x86_64-apple-macosx%s" % g_macos_deployment_target)
489+
cmake_flags.append("-DCMAKE_C_FLAGS=-target %s%s" % (get_build_target(args), g_macos_deployment_target))
490490
cmake_flags.append("-DCMAKE_OSX_DEPLOYMENT_TARGET=%s" % g_macos_deployment_target)
491491

492492
build_with_cmake(args, cmake_flags, args.swift_driver_source_dir, args.swift_driver_build_dir)
@@ -510,7 +510,7 @@ def build_swiftpm_with_cmake(args):
510510
]
511511

512512
if platform.system() == 'Darwin':
513-
cmake_flags.append("-DCMAKE_C_FLAGS=-target x86_64-apple-macosx%s" % g_macos_deployment_target)
513+
cmake_flags.append("-DCMAKE_C_FLAGS=-target %s%s" % (get_build_target(args), g_macos_deployment_target))
514514
cmake_flags.append("-DCMAKE_OSX_DEPLOYMENT_TARGET=%s" % g_macos_deployment_target)
515515

516516
build_with_cmake(args, cmake_flags, args.project_root, args.bootstrap_dir)

0 commit comments

Comments
 (0)