really replace SDK with SDKBIN
This commit is contained in:
@@ -1226,7 +1226,7 @@ RCLINKFLAGS+= $(ENVRCLINKFLAGS)
|
||||
LINKFLAGSRUNPATH_URELIB*=
|
||||
LINKFLAGSRUNPATH_UREBIN*=
|
||||
LINKFLAGSRUNPATH_OOO*=
|
||||
LINKFLAGSRUNPATH_SDK*=
|
||||
LINKFLAGSRUNPATH_SDKBIN*=
|
||||
LINKFLAGSRUNPATH_OXT*=
|
||||
LINKFLAGSRUNPATH_NONE*=
|
||||
|
||||
|
@@ -43,7 +43,7 @@ BRANDPROGRAMDIRS=$(subst,$(SPACECHAR),$(COLON) $(foreach,i,{$(PRODUCTLIST)} /opt
|
||||
LINKFLAGSRUNPATH_URELIB:=-Wl,-blibpath:$(URELIBDIRS):/usr/lib:/lib
|
||||
LINKFLAGSRUNPATH_UREBIN:=-Wl,-blibpath:$(URELIBDIRS):$(UREBINDIRS):/usr/lib:/lib
|
||||
LINKFLAGSRUNPATH_OOO:=-Wl,-blibpath:$(BRANDPROGRAMDIRS):$(URELIBDIRS):/usr/lib:/lib
|
||||
LINKFLAGSRUNPATH_SDK:=-Wl,-blibpath:$(URELIBDIRS):/usr/lib:/lib
|
||||
LINKFLAGSRUNPATH_SDKBIN:=-Wl,-blibpath:$(URELIBDIRS):/usr/lib:/lib
|
||||
LINKFLAGS:=-Wl,-brtl -Wl,-bnolibpath
|
||||
|
||||
LINKFLAGSAPPGUI:=
|
||||
|
@@ -66,4 +66,4 @@ ENFORCEDSHLPREFIX=lib
|
||||
LINKFLAGSRUNPATH_URELIB=
|
||||
LINKFLAGSRUNPATH_UREBIN=
|
||||
LINKFLAGSRUNPATH_OOO=
|
||||
LINKFLAGSRUNPATH_SDK=
|
||||
LINKFLAGSRUNPATH_SDKBIN=
|
||||
|
@@ -195,7 +195,7 @@ LINKFLAGSRUNPATH_URELIB=-Wl,-rpath,\''$$ORIGIN'\',--enable-new-dtags
|
||||
LINKFLAGSRUNPATH_UREBIN=-Wl,-rpath,\''$$ORIGIN/../lib:$$ORIGIN'\',--enable-new-dtags
|
||||
#TODO: drop $ORIGIN once no URE executable is also shipped in OOo
|
||||
LINKFLAGSRUNPATH_OOO=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\',--enable-new-dtags
|
||||
LINKFLAGSRUNPATH_SDK=-Wl,-rpath,\''$$ORIGIN/../../ure-link/lib'\',--enable-new-dtags
|
||||
LINKFLAGSRUNPATH_SDKBIN=-Wl,-rpath,\''$$ORIGIN/../../ure-link/lib'\',--enable-new-dtags
|
||||
LINKFLAGSRUNPATH_OXT=
|
||||
LINKFLAGSRUNPATH_NONE=
|
||||
# flag -Wl,-z,noexecstack sets the NX bit on the stack
|
||||
|
@@ -185,7 +185,7 @@ EXTRA_LINKFLAGS*:=-Wl,-syslibroot,$(MACOSX_SDK_PATH)
|
||||
LINKFLAGSRUNPATH_URELIB=-install_name '@__________________________________________________URELIB/$(@:f)'
|
||||
LINKFLAGSRUNPATH_UREBIN=
|
||||
LINKFLAGSRUNPATH_OOO=-install_name '@__________________________________________________OOO/$(@:f)'
|
||||
LINKFLAGSRUNPATH_SDK=
|
||||
LINKFLAGSRUNPATH_SDKBIN=
|
||||
LINKFLAGSRUNPATH_OXT=
|
||||
LINKFLAGSRUNPATH_NONE=-install_name '@__________________________________________________NONE/$(@:f)'
|
||||
LINKFLAGS=$(LINKFLAGSDEFS)
|
||||
|
@@ -18,7 +18,7 @@ BUILD64=1
|
||||
# NetBSD has no support for using relative paths with $ORIGIN
|
||||
LINKFLAGSRUNPATH_UREBIN=
|
||||
LINKFLAGSRUNPATH_OOO=
|
||||
LINKFLAGSRUNPATH_SDK=
|
||||
LINKFLAGSRUNPATH_SDKBIN=
|
||||
|
||||
LINKFLAGSDEFS=-Wl,--ignore-unresolved-symbol,environ
|
||||
LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS)
|
||||
|
@@ -131,7 +131,7 @@ LINKFLAGSRUNPATH_URELIB=-R\''$$ORIGIN'\'
|
||||
LINKFLAGSRUNPATH_UREBIN=-R\''$$ORIGIN/../lib:$$ORIGIN'\'
|
||||
#TODO: drop $ORIGIN once no URE executable is also shipped in OOo
|
||||
LINKFLAGSRUNPATH_OOO=-R\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\'
|
||||
LINKFLAGSRUNPATH_SDK=-R\''$$ORIGIN/../../ure-link/lib'\'
|
||||
LINKFLAGSRUNPATH_SDKBIN=-R\''$$ORIGIN/../../ure-link/lib'\'
|
||||
LINKFLAGSRUNPATH_OXT=
|
||||
LINKFLAGSRUNPATH_NONE=
|
||||
LINKFLAGS=-w -mt -z combreloc -PIC -temp=/tmp -norunpath -library=no%Cstd
|
||||
|
@@ -137,7 +137,7 @@ LINKFLAGSRUNPATH_URELIB=-R\''$$ORIGIN'\'
|
||||
LINKFLAGSRUNPATH_UREBIN=-R\''$$ORIGIN/../lib:$$ORIGIN'\'
|
||||
#TODO: drop $ORIGIN once no URE executable is also shipped in OOo
|
||||
LINKFLAGSRUNPATH_OOO=-R\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\'
|
||||
LINKFLAGSRUNPATH_SDK=-R\''$$ORIGIN/../../ure-link/lib'\'
|
||||
LINKFLAGSRUNPATH_SDKBIN=-R\''$$ORIGIN/../../ure-link/lib'\'
|
||||
LINKFLAGSRUNPATH_OXT=
|
||||
LINKFLAGSRUNPATH_NONE=
|
||||
LINKFLAGS=-w -mt -z combreloc -PIC -temp=/tmp -norunpath -library=no%Cstd
|
||||
|
Reference in New Issue
Block a user