Kaydet (Commit) 1bf04b93 authored tarafından Tor Lillqvist's avatar Tor Lillqvist

Don't use -Wl,-syslibroot when building against more current SDKs

üst e37ae322
...@@ -95,7 +95,7 @@ gb_OBJCXXFLAGS := -x objective-c++ -fobjc-exceptions ...@@ -95,7 +95,7 @@ gb_OBJCXXFLAGS := -x objective-c++ -fobjc-exceptions
gb_OBJCFLAGS := -x objective-c -fobjc-exceptions gb_OBJCFLAGS := -x objective-c -fobjc-exceptions
gb_LinkTarget_LDFLAGS := \ gb_LinkTarget_LDFLAGS := \
-Wl,-syslibroot,$(gb_SDKDIR) \ $(if $(filter 1040 1050,$(MAC_OS_X_VERSION_MIN_REQUIRED)),-Wl$(COMMA)-syslibroot$(COMMA)$(gb_SDKDIR)) \
$(subst -L../lib , ,$(SOLARLIB)) \ $(subst -L../lib , ,$(SOLARLIB)) \
#man ld says: obsolete -Wl,-multiply_defined,suppress \ #man ld says: obsolete -Wl,-multiply_defined,suppress \
......
...@@ -178,8 +178,12 @@ LINK*=$(CXX) ...@@ -178,8 +178,12 @@ LINK*=$(CXX)
LINKC*=$(CC) LINKC*=$(CC)
LINKFLAGSDEFS*=-Wl,-multiply_defined,suppress LINKFLAGSDEFS*=-Wl,-multiply_defined,suppress
.IF "$(MAC_OS_X_VERSION_MIN_REQUIRED)" <= "1050"
# assure backwards-compatibility # assure backwards-compatibility
EXTRA_LINKFLAGS*:=-Wl,-syslibroot,$(MACOSX_SDK_PATH) EXTRA_LINKFLAGS*:=-Wl,-syslibroot,$(MACOSX_SDK_PATH)
.ENDIF
# Very long install_names are needed so that install_name_tool -change later on # Very long install_names are needed so that install_name_tool -change later on
# does not complain that "larger updated load commands do not fit:" # does not complain that "larger updated load commands do not fit:"
LINKFLAGSRUNPATH_URELIB=-install_name '@__________________________________________________URELIB/$(@:f)' LINKFLAGSRUNPATH_URELIB=-install_name '@__________________________________________________URELIB/$(@:f)'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment