Skip to content

Commit cf971c9

Browse files
committed
build: use -isysroot over --sysroot on macOS
1 parent fb66dbe commit cf971c9

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

contrib/macdeploy/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ Working macOS DMGs are created in Linux by combining a recent `clang`, the Apple
5656

5757
Apple uses `clang` extensively for development and has upstreamed the necessary
5858
functionality so that a vanilla clang can take advantage. It supports the use of `-F`,
59-
`-target`, `-mmacosx-version-min`, and `--sysroot`, which are all necessary when
59+
`-target`, `-mmacosx-version-min`, and `-isysroot`, which are all necessary when
6060
building for macOS.
6161

6262
Apple's version of `binutils` (called `cctools`) contains lots of functionality missing in the

depends/builders/darwin.mk

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
build_darwin_CC:=$(shell xcrun -f clang) --sysroot $(shell xcrun --show-sdk-path)
2-
build_darwin_CXX:=$(shell xcrun -f clang++) --sysroot $(shell xcrun --show-sdk-path)
1+
build_darwin_CC:=$(shell xcrun -f clang) -isysroot$(shell xcrun --show-sdk-path)
2+
build_darwin_CXX:=$(shell xcrun -f clang++) -isysroot$(shell xcrun --show-sdk-path)
33
build_darwin_AR:=$(shell xcrun -f ar)
44
build_darwin_RANLIB:=$(shell xcrun -f ranlib)
55
build_darwin_STRIP:=$(shell xcrun -f strip)
@@ -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) --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)
13+
darwin_CC=$(shell xcrun -f clang) -mmacosx-version-min=$(OSX_MIN_VERSION) -isysroot$(shell xcrun --show-sdk-path)
14+
darwin_CXX:=$(shell xcrun -f clang++) -mmacosx-version-min=$(OSX_MIN_VERSION) -stdlib=libc++ -isysroot$(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)

depends/hosts/darwin.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,15 +100,15 @@ darwin_CC=env -u C_INCLUDE_PATH -u CPLUS_INCLUDE_PATH \
100100
-u LIBRARY_PATH \
101101
$(clang_prog) --target=$(host) -mmacosx-version-min=$(OSX_MIN_VERSION) \
102102
-B$(build_prefix)/bin -mlinker-version=$(LD64_VERSION) \
103-
--sysroot=$(OSX_SDK) \
103+
-isysroot$(OSX_SDK) \
104104
-Xclang -internal-externc-isystem$(clang_resource_dir)/include \
105105
-Xclang -internal-externc-isystem$(OSX_SDK)/usr/include
106106
darwin_CXX=env -u C_INCLUDE_PATH -u CPLUS_INCLUDE_PATH \
107107
-u OBJC_INCLUDE_PATH -u OBJCPLUS_INCLUDE_PATH -u CPATH \
108108
-u LIBRARY_PATH \
109109
$(clangxx_prog) --target=$(host) -mmacosx-version-min=$(OSX_MIN_VERSION) \
110110
-B$(build_prefix)/bin -mlinker-version=$(LD64_VERSION) \
111-
--sysroot=$(OSX_SDK) \
111+
-isysroot$(OSX_SDK) \
112112
-stdlib=libc++ -nostdinc++ \
113113
-Xclang -cxx-isystem$(OSX_SDK)/usr/include/c++/v1 \
114114
-Xclang -internal-externc-isystem$(clang_resource_dir)/include \

0 commit comments

Comments
 (0)