Skip to content

Commit 25202ca

Browse files
committed
Merge bitcoin/bitcoin#27721: depends: remove redundant stdlib option
4fe5f3c depends: remove redundant stdlib option (Cory Fields) Pull request description: Like #27628, this is another dependency of #21778, though it doesn't become obvious until used with a newer clang. This should be a no-op. Use of -stdlib++-isystem gets rid of any system c++ header include paths and negates the need for this option. In newer versions of clangs the combo produces an annoying warning that actually causes problems during configure. ACKs for top commit: fanquake: ACK 4fe5f3c Tree-SHA512: 904072f2b13dffbbeab2bc9ff20a74969888502fa1ea35d9030784dd397c6751e31233e6ec7dc34e9fd42574950be733b25d6653c2a93e214cc5e4eef2e0133a
2 parents 9d098af + 4fe5f3c commit 25202ca

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

depends/hosts/darwin.mk

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ $(foreach TOOL,$(cctools_TOOLS),$(eval darwin_$(TOOL) = $$(build_prefix)/bin/$$(
6363
# Explicitly point to our binaries (e.g. cctools) so that they are
6464
# ensured to be found and preferred over other possibilities.
6565
#
66-
# -stdlib=libc++ -stdlib++-isystem$(OSX_SDK)/usr/include/c++/v1
66+
# -stdlib++-isystem$(OSX_SDK)/usr/include/c++/v1
6767
#
6868
# Forces clang to use the libc++ headers from our SDK and completely
6969
# forget about the libc++ headers from the standard directories
@@ -107,7 +107,6 @@ darwin_CXX=env -u C_INCLUDE_PATH -u CPLUS_INCLUDE_PATH \
107107
$(clangxx_prog) --target=$(host) -mmacosx-version-min=$(OSX_MIN_VERSION) \
108108
-B$(build_prefix)/bin -mlinker-version=$(LD64_VERSION) \
109109
-isysroot$(OSX_SDK) \
110-
-stdlib=libc++ \
111110
-stdlib++-isystem$(OSX_SDK)/usr/include/c++/v1 \
112111
-Xclang -internal-externc-isystem -Xclang $(clang_resource_dir)/include \
113112
-Xclang -internal-externc-isystem -Xclang $(OSX_SDK)/usr/include

0 commit comments

Comments
 (0)