diff options
| author | fanquake <fanquake@gmail.com> | 2021-04-26 13:05:23 +0800 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2021-05-01 13:40:50 +0800 |
| commit | a5550f877a2c46d01bb620ae051c0c8ed0fecd0b (patch) | |
| tree | 8e40a72b3f3bdc58597e337ed5f758a9f114f029 /depends | |
| parent | 51d9d1607f2e9d593693ca799393f068192e41aa (diff) | |
| download | bitcoin-a5550f877a2c46d01bb620ae051c0c8ed0fecd0b.tar.xz | |
build: use -stdlib++-isystem with Clang 10
Diffstat (limited to 'depends')
| -rw-r--r-- | depends/hosts/darwin.mk | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/depends/hosts/darwin.mk b/depends/hosts/darwin.mk index 1a6f9666a2..5a7ae2df9a 100644 --- a/depends/hosts/darwin.mk +++ b/depends/hosts/darwin.mk @@ -60,16 +60,11 @@ $(foreach TOOL,$(cctools_TOOLS),$(eval darwin_$(TOOL) = $$(build_prefix)/bin/$$( # Explicitly point to our binaries (e.g. cctools) so that they are # ensured to be found and preferred over other possibilities. # -# -stdlib=libc++ -nostdinc++ -Xclang -cxx-isystem$(OSX_SDK)/usr/include/c++/v1 +# -stdlib=libc++ -stdlib++-isystem$(OSX_SDK)/usr/include/c++/v1 # # Forces clang to use the libc++ headers from our SDK and completely # forget about the libc++ headers from the standard directories # -# TODO: Once we start requiring a clang version that has the -# -stdlib++-isystem<directory> flag first introduced here: -# https://reviews.llvm.org/D64089, we should use that instead. Read the -# differential summary there for more details. -# # -Xclang -*system<path_a> \ # -Xclang -*system<path_b> \ # -Xclang -*system<path_c> ... @@ -109,8 +104,8 @@ darwin_CXX=env -u C_INCLUDE_PATH -u CPLUS_INCLUDE_PATH \ $(clangxx_prog) --target=$(host) -mmacosx-version-min=$(OSX_MIN_VERSION) \ -B$(build_prefix)/bin -mlinker-version=$(LD64_VERSION) \ -isysroot$(OSX_SDK) \ - -stdlib=libc++ -nostdinc++ \ - -Xclang -cxx-isystem$(OSX_SDK)/usr/include/c++/v1 \ + -stdlib=libc++ \ + -stdlib++-isystem$(OSX_SDK)/usr/include/c++/v1 \ -Xclang -internal-externc-isystem$(clang_resource_dir)/include \ -Xclang -internal-externc-isystem$(OSX_SDK)/usr/include |