Skip to content

Commit 3740a20

Browse files
3405691582compnerd
andauthored
Apply suggestions from code review
Co-authored-by: Saleem Abdulrasool <compnerd@compnerd.org>
1 parent 47ae4d9 commit 3740a20

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

cmake/modules/SwiftConfigureSDK.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -405,7 +405,7 @@ macro(configure_sdk_unix name architectures)
405405

406406
set(SWIFT_SDK_OPENBSD_ARCH_amd64_TRIPLE "amd64-unknown-openbsd${openbsd_system_version}")
407407

408-
if(NOT CMAKE_SYSROOT STREQUAL "")
408+
if(CMAKE_SYSROOT)
409409
set(SWIFT_SDK_OPENBSD_ARCH_${arch}_PATH "${CMAKE_SYSROOT}${SWIFT_SDK_OPENBSD_ARCH_${arch}_PATH}" CACHE INTERNAL "sysroot path" FORCE)
410410
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)
411411
endif()

utils/build-script-impl

+2-2
Original file line numberDiff line numberDiff line change
@@ -1606,7 +1606,7 @@ for host in "${ALL_HOSTS[@]}"; do
16061606
)
16071607
fi
16081608

1609-
if [[ "${host}" == "openbsd-"* && "${OPENBSD_USE_TOOLCHAIN_FILE}" != "" ]]; then
1609+
if [[ "${host}" == "openbsd-"* && -n "${OPENBSD_USE_TOOLCHAIN_FILE}" ]]; then
16101610
llvm_cmake_options=(
16111611
"${llvm_cmake_options[@]}"
16121612
-DCMAKE_TOOLCHAIN_FILE="${OPENBSD_USE_TOOLCHAIN_FILE}"
@@ -1894,7 +1894,7 @@ for host in "${ALL_HOSTS[@]}"; do
18941894
)
18951895
fi
18961896

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
18981898
cmake_options=(
18991899
"${cmake_options[@]}"
19001900
-DCMAKE_TOOLCHAIN_FILE="${OPENBSD_USE_TOOLCHAIN_FILE}"

0 commit comments

Comments
 (0)