Skip to content

Commit cbc9bf1

Browse files
committed
build: move -mlinker-version to *FLAGS
This doesn't need to exist in C & CXX.
1 parent 42b2283 commit cbc9bf1

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

depends/hosts/darwin.mk

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,15 +80,15 @@ darwin_CC=env -u C_INCLUDE_PATH -u CPLUS_INCLUDE_PATH \
8080
-u OBJC_INCLUDE_PATH -u OBJCPLUS_INCLUDE_PATH -u CPATH \
8181
-u LIBRARY_PATH \
8282
$(clang_prog) --target=$(host) \
83-
-B$(build_prefix)/bin -mlinker-version=$(LD64_VERSION) \
83+
-B$(build_prefix)/bin \
8484
-isysroot$(OSX_SDK) -nostdlibinc \
8585
-iwithsysroot/usr/include -iframeworkwithsysroot/System/Library/Frameworks
8686

8787
darwin_CXX=env -u C_INCLUDE_PATH -u CPLUS_INCLUDE_PATH \
8888
-u OBJC_INCLUDE_PATH -u OBJCPLUS_INCLUDE_PATH -u CPATH \
8989
-u LIBRARY_PATH \
9090
$(clangxx_prog) --target=$(host) \
91-
-B$(build_prefix)/bin -mlinker-version=$(LD64_VERSION) \
91+
-B$(build_prefix)/bin \
9292
-isysroot$(OSX_SDK) -nostdlibinc \
9393
-iwithsysroot/usr/include/c++/v1 \
9494
-iwithsysroot/usr/include -iframeworkwithsysroot/System/Library/Frameworks
@@ -97,6 +97,11 @@ darwin_CFLAGS=-pipe -std=$(C_STANDARD) -mmacosx-version-min=$(OSX_MIN_VERSION)
9797
darwin_CXXFLAGS=-pipe -std=$(CXX_STANDARD) -mmacosx-version-min=$(OSX_MIN_VERSION)
9898
darwin_LDFLAGS=-Wl,-platform_version,macos,$(OSX_MIN_VERSION),$(OSX_SDK_VERSION)
9999

100+
ifneq ($(build_os),darwin)
101+
darwin_CFLAGS += -mlinker-version=$(LD64_VERSION)
102+
darwin_CXXFLAGS += -mlinker-version=$(LD64_VERSION)
103+
endif
104+
100105
darwin_release_CFLAGS=-O2
101106
darwin_release_CXXFLAGS=$(darwin_release_CFLAGS)
102107

0 commit comments

Comments
 (0)