Skip to content

Commit d1a940f

Browse files
committed
Merge bitcoin/bitcoin#24520: guix: only check for the macOS SDK once
e802310 guix: only check for the macOS SDK once (fanquake) Pull request description: If we are building for both macOS HOSTS, there's no need to check and print that the SDK exists two times. Currently a Guix build for both HOSTS will print: ```bash ./contrib/guix/guix-build Found macOS SDK at '/SDKs/Xcode-12.2-12B45b-extracted-SDK-with-libcxx-headers', using... Found macOS SDK at '/SDKs/Xcode-12.2-12B45b-extracted-SDK-with-libcxx-headers', using... Checking that we can connect to the guix-daemon... ``` ACKs for top commit: laanwj: Code review ACK e802310 achow101: ACK e802310 Tree-SHA512: 7e9ee7793c5dc1eb485806ca3d613742397d2cc62525203a168cad1ec96aabfd4e63dc3f2e8d205bdb2f3c2079f731d75c5d162d55ff0d42a7e6f3d01d3a7db1
2 parents 05957a8 + e802310 commit d1a940f

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

contrib/guix/guix-build

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ else
121121
fi
122122

123123
################
124-
# When building for darwin, the macOS SDK should exists
124+
# When building for darwin, the macOS SDK should exist
125125
################
126126

127127
for host in $HOSTS; do
@@ -130,6 +130,7 @@ for host in $HOSTS; do
130130
OSX_SDK="$(make -C "${PWD}/depends" --no-print-directory HOST="$host" print-OSX_SDK | sed 's@^[^=]\+=@@g')"
131131
if [ -e "$OSX_SDK" ]; then
132132
echo "Found macOS SDK at '${OSX_SDK}', using..."
133+
break
133134
else
134135
echo "macOS SDK does not exist at '${OSX_SDK}', please place the extracted, untarred SDK there to perform darwin builds, exiting..."
135136
exit 1

0 commit comments

Comments
 (0)