Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

portconfigure: ensure SDK directory is not empty #288

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

portconfigure: ensure SDK directory is not empty #288

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/port1.0/portconfigure.tcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -586,7 +586,7 @@ proc portconfigure::configure_get_sdkroot {sdk_version} {
return $::portconfigure::sdkroot_cache(macosx${try_version})
}
# negative result cached, do nothing here
} elseif {![catch {exec env DEVELOPER_DIR=${cltpath} xcrun --sdk macosx${try_version} --show-sdk-path 2> /dev/null} sdk]} {
} elseif {![catch {exec env DEVELOPER_DIR=${cltpath} xcrun --sdk macosx${try_version} --show-sdk-path 2> /dev/null} sdk] && ${sdk} ne ""} {
set ::portconfigure::sdkroot_cache(macosx${try_version}) $sdk
return $sdk
} else {
Expand All @@ -605,7 +605,7 @@ proc portconfigure::configure_get_sdkroot {sdk_version} {
return $::portconfigure::sdkroot_cache(macosx)
}
# negative result cached, do nothing here
} elseif {![catch {exec env DEVELOPER_DIR=${cltpath} xcrun --sdk macosx --show-sdk-path 2> /dev/null} sdk]} {
} elseif {![catch {exec env DEVELOPER_DIR=${cltpath} xcrun --sdk macosx --show-sdk-path 2> /dev/null} sdk] && ${sdk} ne ""} {
set ::portconfigure::sdkroot_cache(macosx) $sdk
return $sdk
} else {
Expand Down Expand Up @@ -646,7 +646,7 @@ proc portconfigure::configure_get_sdkroot {sdk_version} {
return $::portconfigure::sdkroot_cache(macosx${try_version},noclt)
}
# negative result cached, do nothing here
} elseif {![catch {exec xcrun --sdk macosx${try_version} --show-sdk-path 2> /dev/null} sdk]} {
} elseif {![catch {exec xcrun --sdk macosx${try_version} --show-sdk-path 2> /dev/null} sdk] && ${sdk} ne ""} {
set ::portconfigure::sdkroot_cache(macosx${try_version},noclt) $sdk
return $sdk
} else {
Expand Down Expand Up @@ -681,7 +681,7 @@ proc portconfigure::configure_get_sdkroot {sdk_version} {
if {[info exists ::portconfigure::sdkroot_cache(macosx,noclt)]} {
# no negative-cached case here because that would mean overall failure
return $::portconfigure::sdkroot_cache(macosx,noclt)
} elseif {![catch {exec xcrun --sdk macosx --show-sdk-path 2> /dev/null} sdk]} {
} elseif {![catch {exec xcrun --sdk macosx --show-sdk-path 2> /dev/null} sdk] && ${sdk} ne ""} {
set ::portconfigure::sdkroot_cache(macosx,noclt) $sdk
return $sdk
}
Expand Down