Skip to content

[5.3] Adjust swift target based on CMAKE_OSX_ARCHITECTURE #697

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
shahmishal merged 3 commits into from
Sep 10, 2020
Merged

[5.3] Adjust swift target based on CMAKE_OSX_ARCHITECTURE #697

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
aa03059
Adjust swift target based on CMAKE_OSX_ARCHITECTURE
dmbryson Aug 19, 2020
6bfef83
Update products/llbuildSwift/CMakeLists.txt
dmbryson Aug 19, 2020
07161c7
Set default for CMAKE_OSX_ARCHITECTURES x86_64
shahmishal Sep 8, 2020
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
7 changes: 6 additions & 1 deletion products/llbuildSwift/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,14 @@ if(CMAKE_VERSION VERSION_LESS 3.16)
endif()
endif()

# Set x86_64 default if CMAKE_OSX_ARCHITECTURES is not set
if(NOT DEFINED CMAKE_OSX_ARCHITECTURES)
set(CMAKE_OSX_ARCHITECTURES "x86_64")
endif()

# TODO(compnerd) move both of these outside of the CMake into the invocation
if(CMAKE_SYSTEM_NAME STREQUAL Darwin)
add_compile_options(-target x86_64-apple-macosx10.10)
add_compile_options(-target ${CMAKE_OSX_ARCHITECTURES}-apple-macosx10.10)
if(NOT CMAKE_OSX_SYSROOT STREQUAL "")
add_compile_options(-sdk ${CMAKE_OSX_SYSROOT})
endif()
Expand Down