Skip to content

Set explicitly the desired Darwin architecture for all CMake builds #1169

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 7, 2022
Merged

Set explicitly the desired Darwin architecture for all CMake builds #1169

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions Utilities/build-script-helper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -425,6 +425,7 @@ def build_using_cmake(args, toolchain_bin, build_dir, targets):
swift_flags.append('-target %s' % target)
if platform.system() == 'Darwin':
base_cmake_flags.append('-DCMAKE_OSX_DEPLOYMENT_TARGET=%s' % macos_deployment_target)
base_cmake_flags.append('-DCMAKE_OSX_ARCHITECTURES=%s' % target.split('-')[0])

# Target directory for build artifacts
# If building for a local compiler build, use the build directory directly
Expand Down Expand Up @@ -469,8 +470,6 @@ def build_llbuild_using_cmake(args, target, swiftc_exec, build_dir, base_cmake_f
'-DCMAKE_CXX_FLAGS=-target %s' % target,
'-DLLBUILD_SUPPORT_BINDINGS:=Swift'
]
if platform.system() == 'Darwin':
flags.append('-DCMAKE_OSX_ARCHITECTURES=%s' % target.split('-')[0])
llbuild_cmake_flags = base_cmake_flags + flags
if args.sysroot:
llbuild_cmake_flags.append('-DSQLite3_INCLUDE_DIR=%s/usr/include' % args.sysroot)
Expand Down