Skip to content

Commit 4cfb673

Browse files
committed
Merge #17118: build: depends macOS: point --sysroot to SDK
a0daea4 [build] depends macOS: point --sysroot to SDK (Sjors Provoost) Pull request description: Fixes errors like `fatal error: 'unistd.h' file not found` when building depends on macOS. Replaces #14352 (which doesn't work on Catalina). ACKs for top commit: jonasschnelli: utACK a0daea4 Tree-SHA512: 995b1e1e84e635b32d1d4038bc63730c94a7c318b7240f6d62825977e5c97fe52c5aa5a0f39070beb0df8271dd294b36d6b5cf7f09ad07494fb15d5bd4d77f68
2 parents eb292af + a0daea4 commit 4cfb673

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

depends/builders/darwin.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ build_darwin_SHA256SUM=shasum -a 256
1010
build_darwin_DOWNLOAD=curl --location --fail --connect-timeout $(DOWNLOAD_CONNECT_TIMEOUT) --retry $(DOWNLOAD_RETRIES) -o
1111

1212
#darwin host on darwin builder. overrides darwin host preferences.
13-
darwin_CC=$(shell xcrun -f clang) -mmacosx-version-min=$(OSX_MIN_VERSION)
14-
darwin_CXX:=$(shell xcrun -f clang++) -mmacosx-version-min=$(OSX_MIN_VERSION) -stdlib=libc++
13+
darwin_CC=$(shell xcrun -f clang) -mmacosx-version-min=$(OSX_MIN_VERSION) --sysroot $(shell xcrun --show-sdk-path)
14+
darwin_CXX:=$(shell xcrun -f clang++) -mmacosx-version-min=$(OSX_MIN_VERSION) -stdlib=libc++ --sysroot $(shell xcrun --show-sdk-path)
1515
darwin_AR:=$(shell xcrun -f ar)
1616
darwin_RANLIB:=$(shell xcrun -f ranlib)
1717
darwin_STRIP:=$(shell xcrun -f strip)

0 commit comments

Comments
 (0)