File tree 2 files changed +3
-3
lines changed
2 files changed +3
-3
lines changed Original file line number Diff line number Diff line change @@ -405,7 +405,7 @@ macro(configure_sdk_unix name architectures)
405
405
406
406
set (SWIFT_SDK_OPENBSD_ARCH_amd64_TRIPLE "amd64-unknown-openbsd${openbsd_system_version} " )
407
407
408
- if (NOT CMAKE_SYSROOT STREQUAL "" )
408
+ if (CMAKE_SYSROOT)
409
409
set (SWIFT_SDK_OPENBSD_ARCH_${arch} _PATH "${CMAKE_SYSROOT} ${SWIFT_SDK_OPENBSD_ARCH_${arch} _PATH}" CACHE INTERNAL "sysroot path" FORCE)
410
410
set (SWIFT_SDK_OPENBSD_ARCH_${arch} _LIBC_INCLUDE_DIRECTORY "${CMAKE_SYSROOT} ${SWIFT_SDK_OPENBSD_ARCH_${arch} _LIBC_INCLUDE_DIRECTORY}" CACHE INTERNAL "sysroot libc path" FORCE)
411
411
endif ()
Original file line number Diff line number Diff line change @@ -1606,7 +1606,7 @@ for host in "${ALL_HOSTS[@]}"; do
1606
1606
)
1607
1607
fi
1608
1608
1609
- if [[ " ${host} " == " openbsd-" * && " ${OPENBSD_USE_TOOLCHAIN_FILE} " != " " ]]; then
1609
+ if [[ " ${host} " == " openbsd-" * && -n " ${OPENBSD_USE_TOOLCHAIN_FILE} " ]]; then
1610
1610
llvm_cmake_options=(
1611
1611
" ${llvm_cmake_options[@]} "
1612
1612
-DCMAKE_TOOLCHAIN_FILE=" ${OPENBSD_USE_TOOLCHAIN_FILE} "
@@ -1894,7 +1894,7 @@ for host in "${ALL_HOSTS[@]}"; do
1894
1894
)
1895
1895
fi
1896
1896
1897
- if [[ $( is_cross_tools_host ${host} ) && " ${host} " == " openbsd-" * && " ${OPENBSD_USE_TOOLCHAIN_FILE} " != " " ]]; then
1897
+ if [[ $( is_cross_tools_host ${host} ) && " ${host} " == " openbsd-" * && -n " ${OPENBSD_USE_TOOLCHAIN_FILE} " ]]; then
1898
1898
cmake_options=(
1899
1899
" ${cmake_options[@]} "
1900
1900
-DCMAKE_TOOLCHAIN_FILE=" ${OPENBSD_USE_TOOLCHAIN_FILE} "
You can’t perform that action at this time.
0 commit comments