Skip to content

Commit 3e42a0f

Browse files
committed
[android] Escape include paths in Android.
Before the result of `_add_variant_c_compile_flags` was a string, so appending several "-isystem" was not a problem. With #29451 the rules have changed since the list is now handled by CMake, and it deduplicates the repeated members in the list. Thanks, CMake. Should fix the Android CI builds that were failing since the merging of #29451.
1 parent ccde540 commit 3e42a0f

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

cmake/modules/AddSwift.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -363,7 +363,7 @@ function(_add_variant_c_compile_flags)
363363
swift_android_libcxx_include_paths(CFLAGS_CXX_INCLUDES)
364364
swift_android_include_for_arch("${CFLAGS_ARCH}" "${CFLAGS_ARCH}_INCLUDE")
365365
foreach(path IN LISTS CFLAGS_CXX_INCLUDES ${CFLAGS_ARCH}_INCLUDE)
366-
list(APPEND result -isystem;${path})
366+
list(APPEND result "SHELL:${CMAKE_INCLUDE_SYSTEM_FLAG_C}${path}")
367367
endforeach()
368368
list(APPEND result "-D__ANDROID_API__=${SWIFT_ANDROID_API_LEVEL}")
369369
elseif(CFLAGS_SDK STREQUAL WINDOWS)

0 commit comments

Comments
 (0)