File tree 2 files changed +6
-12
lines changed
2 files changed +6
-12
lines changed Original file line number Diff line number Diff line change @@ -628,14 +628,9 @@ function(_add_swift_host_library_single target)
628
628
PROPERTIES
629
629
INSTALL_RPATH "$ORIGIN:/usr/lib/swift/cygwin" )
630
630
elseif ("${SWIFT_HOST_VARIANT_SDK} " STREQUAL "ANDROID" )
631
- # Only set the install RPATH if cross-compiling the host tools, in which
632
- # case both the NDK and Sysroot paths must be set.
633
- if (NOT "${SWIFT_ANDROID_NDK_PATH} " STREQUAL "" AND
634
- NOT "${SWIFT_ANDROID_NATIVE_SYSROOT} " STREQUAL "" )
635
- set_target_properties ("${target} "
636
- PROPERTIES
637
- INSTALL_RPATH "$ORIGIN" )
638
- endif ()
631
+ set_target_properties ("${target} "
632
+ PROPERTIES
633
+ INSTALL_RPATH "$ORIGIN" )
639
634
endif ()
640
635
641
636
set_target_properties ("${target} " PROPERTIES BUILD_WITH_INSTALL_RPATH YES )
Original file line number Diff line number Diff line change @@ -527,10 +527,9 @@ function(_add_swift_target_library_single target name)
527
527
if (SWIFTLIB_SINGLE_TARGET_LIBRARY)
528
528
set_target_properties ("${target} " PROPERTIES NO_SONAME TRUE )
529
529
endif ()
530
- # Only set the install RPATH if cross-compiling the host tools, in which
531
- # case both the NDK and Sysroot paths must be set.
532
- if (NOT "${SWIFT_ANDROID_NDK_PATH} " STREQUAL "" AND
533
- NOT "${SWIFT_ANDROID_NATIVE_SYSROOT} " STREQUAL "" )
530
+ # Only set the install RPATH if the toolchain and stdlib will be in Termux
531
+ # or some other native sysroot on Android.
532
+ if (NOT "${SWIFT_ANDROID_NATIVE_SYSROOT} " STREQUAL "" )
534
533
set_target_properties ("${target} "
535
534
PROPERTIES
536
535
INSTALL_RPATH "$ORIGIN" )
You can’t perform that action at this time.
0 commit comments