Skip to content

Commit 30cd1ad

Browse files
committed
Runtimes: pass target variant flags when compiling assembly code
This ensure we build code correctly for macCatalyst. Addresses rdar://163363796
1 parent 9069d32 commit 30cd1ad

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

Runtimes/Core/cmake/modules/CatalystSupport.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@
55

66
if(SwiftCore_COMPILER_VARIANT_TARGET)
77
add_compile_options(
8-
"$<$<COMPILE_LANGUAGE:C,CXX>:SHELL:-darwin-target-variant ${SwiftCore_COMPILER_VARIANT_TARGET}>"
8+
"$<$<COMPILE_LANGUAGE:ASM,C,CXX>:SHELL:-darwin-target-variant ${SwiftCore_COMPILER_VARIANT_TARGET}>"
99
"$<$<COMPILE_LANGUAGE:Swift>:SHELL:-target-variant ${SwiftCore_COMPILER_VARIANT_TARGET}>"
1010

1111
# TODO: Remove me once we have a driver with
1212
# https://github.com/swiftlang/swift-driver/pull/1803
1313
"$<$<COMPILE_LANGUAGE:Swift>:SHELL:-Xclang-linker -darwin-target-variant -Xclang-linker ${SwiftCore_COMPILER_VARIANT_TARGET}>")
1414

1515
add_link_options(
16-
"$<$<LINK_LANGUAGE:C,CXX>:SHELL:-darwin-target-variant ${SwiftCore_COMPILER_VARIANT_TARGET}>"
16+
"$<$<LINK_LANGUAGE:ASM,C,CXX>:SHELL:-darwin-target-variant ${SwiftCore_COMPILER_VARIANT_TARGET}>"
1717
"$<$<LINK_LANGUAGE:Swift>:SHELL:-target-variant ${SwiftCore_COMPILER_VARIANT_TARGET}>"
1818

1919
# TODO: Remove me once we have a driver with

Runtimes/Overlay/cmake/modules/CatalystSupport.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@ include(CheckCompilerFlag)
77

88
if(${PROJECT_NAME}_COMPILER_VARIANT_TARGET)
99
add_compile_options(
10-
"$<$<COMPILE_LANGUAGE:C,CXX>:SHELL:-darwin-target-variant ${${PROJECT_NAME}_COMPILER_VARIANT_TARGET}>"
10+
"$<$<COMPILE_LANGUAGE:ASM,C,CXX>:SHELL:-darwin-target-variant ${${PROJECT_NAME}_COMPILER_VARIANT_TARGET}>"
1111
"$<$<COMPILE_LANGUAGE:Swift>:SHELL:-target-variant ${${PROJECT_NAME}_COMPILER_VARIANT_TARGET}>"
1212

1313
# TODO: Remove me once we have a driver with
1414
# https://github.com/swiftlang/swift-driver/pull/1803
1515
"$<$<COMPILE_LANGUAGE:Swift>:SHELL:-Xclang-linker -darwin-target-variant -Xclang-linker ${${PROJECT_NAME}_COMPILER_VARIANT_TARGET}>")
1616

1717
add_link_options(
18-
"$<$<LINK_LANGUAGE:C,CXX>:SHELL:-darwin-target-variant ${${PROJECT_NAME}_COMPILER_VARIANT_TARGET}>"
18+
"$<$<LINK_LANGUAGE:ASM,C,CXX>:SHELL:-darwin-target-variant ${${PROJECT_NAME}_COMPILER_VARIANT_TARGET}>"
1919
"$<$<LINK_LANGUAGE:Swift>:SHELL:-target-variant ${${PROJECT_NAME}_COMPILER_VARIANT_TARGET}>"
2020

2121
# TODO: Remove me once we have a driver with

Runtimes/Supplemental/cmake/modules/CatalystSupport.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@ include(CheckCompilerFlag)
77

88
if(${PROJECT_NAME}_COMPILER_VARIANT_TARGET)
99
add_compile_options(
10-
"$<$<COMPILE_LANGUAGE:C,CXX>:SHELL:-darwin-target-variant ${${PROJECT_NAME}_COMPILER_VARIANT_TARGET}>"
10+
"$<$<COMPILE_LANGUAGE:ASM,C,CXX>:SHELL:-darwin-target-variant ${${PROJECT_NAME}_COMPILER_VARIANT_TARGET}>"
1111
"$<$<COMPILE_LANGUAGE:Swift>:SHELL:-target-variant ${${PROJECT_NAME}_COMPILER_VARIANT_TARGET}>"
1212

1313
# TODO: Remove me once we have a driver with
1414
# https://github.com/swiftlang/swift-driver/pull/1803
1515
"$<$<COMPILE_LANGUAGE:Swift>:SHELL:-Xclang-linker -darwin-target-variant -Xclang-linker ${${PROJECT_NAME}_COMPILER_VARIANT_TARGET}>")
1616

1717
add_link_options(
18-
"$<$<LINK_LANGUAGE:C,CXX>:SHELL:-darwin-target-variant ${${PROJECT_NAME}_COMPILER_VARIANT_TARGET}>"
18+
"$<$<LINK_LANGUAGE:ASM,C,CXX>:SHELL:-darwin-target-variant ${${PROJECT_NAME}_COMPILER_VARIANT_TARGET}>"
1919
"$<$<LINK_LANGUAGE:Swift>:SHELL:-target-variant ${${PROJECT_NAME}_COMPILER_VARIANT_TARGET}>"
2020

2121
# TODO: Remove me once we have a driver with

0 commit comments

Comments
 (0)