Skip to content

C
core
Kaydet (Commit) d03465a4 authored tarafından Stephan Bergmann's avatar Stephan Bergmann
Dosyalara gözat
Seçenekler

Undo basis/brand split: removed RPATH BRAND (same as OOO now).

üst e817dcce
Show whitespace changes
Inline Side-by-side
Showing with 16 additions and 35 deletions
Repository.mk
Dosyayı görüntüle @ d03465a4
...@@ -46,15 +46,12 @@ $(eval $(call gb_Helper_register_executables,NONE, \ ...@@ -46,15 +46,12 @@ $(eval $(call gb_Helper_register_executables,NONE, \
$(eval $(call gb_Helper_register_executables,OOO, \ $(eval $(call gb_Helper_register_executables,OOO, \
spadmin.bin \ spadmin.bin \
))
$(eval $(call gb_Helper_register_executables,BRAND,\
testtool \ testtool \
)) ))
ifeq ($(OS),WNT) ifeq ($(OS),WNT)
$(eval $(call gb_Helper_register_executables,BRAND,\ $(eval $(call gb_Helper_register_executables,OOO,\
guiloader \ guiloader \
guistdio \ guistdio \
loader2 \ loader2 \
...@@ -76,20 +73,20 @@ $(eval $(call gb_Helper_register_executables,BRAND,\ ...@@ -76,20 +73,20 @@ $(eval $(call gb_Helper_register_executables,BRAND,\
else else
$(eval $(call gb_Helper_register_executables,BRAND,\ $(eval $(call gb_Helper_register_executables,OOO,\
soffice.bin \ soffice.bin \
unopkg.bin \ unopkg.bin \
)) ))
ifeq ($(OS),MACOSX) ifeq ($(OS),MACOSX)
$(eval $(call gb_Helper_register_executables,BRAND,\ $(eval $(call gb_Helper_register_executables,OOO,\
officeloader \ officeloader \
)) ))
else else
$(eval $(call gb_Helper_register_executables,BRAND,\ $(eval $(call gb_Helper_register_executables,OOO,\
oosplash \ oosplash \
)) ))
......
crashrep/source/unx/makefile.mk
Dosyayı görüntüle @ d03465a4
...@@ -54,7 +54,7 @@ OBJFILES=\ ...@@ -54,7 +54,7 @@ OBJFILES=\
APP1NOSAL=TRUE APP1NOSAL=TRUE
APP1TARGET=$(TARGET) APP1TARGET=$(TARGET)
APP1OBJS=$(OBJFILES) APP1OBJS=$(OBJFILES)
APP1RPATH=BRAND APP1RPATH=OOO
.IF "$(OS)" != "FREEBSD" && "$(OS)" != "MACOSX" && "$(OS)"!="NETBSD" && \ .IF "$(OS)" != "FREEBSD" && "$(OS)" != "MACOSX" && "$(OS)"!="NETBSD" && \
"$(OS)" != "DRAGONFLY" "$(OS)" != "DRAGONFLY"
......
crashrep/source/win32/makefile.mk
Dosyayı görüntüle @ d03465a4
...@@ -59,7 +59,7 @@ APP1OBJS=$(OBJFILES) ...@@ -59,7 +59,7 @@ APP1OBJS=$(OBJFILES)
APP1NOSAL=TRUE APP1NOSAL=TRUE
APP1TARGET=$(TARGET) APP1TARGET=$(TARGET)
APP1RPATH=BRAND APP1RPATH=OOO
STDLIB1=\ STDLIB1=\
$(SALLIB)\ $(SALLIB)\
......
extensions/source/nsplugin/source/makefile.mk
Dosyayı görüntüle @ d03465a4
...@@ -116,7 +116,7 @@ SHL1STDLIBS+= $(WS2_32LIB) $(SHELL32LIB) $(OLE32LIB) $(KERNEL32LIB) $(USER32LIB) ...@@ -116,7 +116,7 @@ SHL1STDLIBS+= $(WS2_32LIB) $(SHELL32LIB) $(OLE32LIB) $(KERNEL32LIB) $(USER32LIB)
SHL1DEPN= SHL1DEPN=
SHL1IMPLIB= i$(SHL1TARGET) SHL1IMPLIB= i$(SHL1TARGET)
SHL1DEF= $(MISC)$/$(SHL1TARGET).def SHL1DEF= $(MISC)$/$(SHL1TARGET).def
SHL1RPATH=BRAND SHL1RPATH=OOO
# ----- get some additional keys in versioninfo ------------ # ----- get some additional keys in versioninfo ------------
SHL1ADD_VERINFO=nsplugin.rc SHL1ADD_VERINFO=nsplugin.rc
...@@ -140,7 +140,7 @@ SHL2STDLIBS+= $(WS2_32LIB) $(SHELL32LIB) $(OLE32LIB) $(KERNEL32LIB) $(USER32LIB) ...@@ -140,7 +140,7 @@ SHL2STDLIBS+= $(WS2_32LIB) $(SHELL32LIB) $(OLE32LIB) $(KERNEL32LIB) $(USER32LIB)
SHL2DEPN= SHL2DEPN=
SHL2IMPLIB= i$(SHL2TARGET) SHL2IMPLIB= i$(SHL2TARGET)
SHL2DEF= $(MISC)$/$(SHL2TARGET).def SHL2DEF= $(MISC)$/$(SHL2TARGET).def
SHL2RPATH=BRAND SHL2RPATH=OOO
# ----- get some additional keys in versioninfo ------------ # ----- get some additional keys in versioninfo ------------
SHL2ADD_VERINFO=nsplugin_oo.rc SHL2ADD_VERINFO=nsplugin_oo.rc
......
fpicker/source/unx/kde/makefile.mk
Dosyayı görüntüle @ d03465a4
...@@ -63,7 +63,7 @@ SLOFILES =\ ...@@ -63,7 +63,7 @@ SLOFILES =\
APP1TARGET=$(TARGET) APP1TARGET=$(TARGET)
APP1OBJS=$(SLOFILES) APP1OBJS=$(SLOFILES)
APP1RPATH=BRAND APP1RPATH=OOO
APP1LINKFLAGS=$(KDE_LIBS) -lkio -lX11 APP1LINKFLAGS=$(KDE_LIBS) -lkio -lX11
APP1STDLIBS=$(SALLIB) APP1STDLIBS=$(SALLIB)
......
pyuno/zipcore/makefile.mk
Dosyayı görüntüle @ d03465a4
...@@ -66,7 +66,7 @@ FILES=\ ...@@ -66,7 +66,7 @@ FILES=\
APP1TARGET=python APP1TARGET=python
APP1OBJS=$(OBJFILES) $(SOLARLIBDIR)/pathutils-obj.obj APP1OBJS=$(OBJFILES) $(SOLARLIBDIR)/pathutils-obj.obj
APP1STDLIBS= APP1STDLIBS=
APP1RPATH=BRAND APP1RPATH=OOO
OBJFILES=$(OBJ)/python.obj OBJFILES=$(OBJ)/python.obj
.ENDIF .ENDIF
......
shell/source/unix/misc/makefile.mk
Dosyayı görüntüle @ d03465a4
...@@ -51,7 +51,7 @@ APP1TARGET = gnome-open-url.bin ...@@ -51,7 +51,7 @@ APP1TARGET = gnome-open-url.bin
APP1OBJS = \ APP1OBJS = \
$(OBJ)$/gnome-open-url.obj $(OBJ)$/gnome-open-url.obj
APP1LIBS = APP1LIBS =
APP1RPATH = BRAND APP1RPATH = OOO
.IF "$(OS)"!="FREEBSD" && "$(OS)"!="NETBSD" && "$(OS)"!="OPENBSD" && \ .IF "$(OS)"!="FREEBSD" && "$(OS)"!="NETBSD" && "$(OS)"!="OPENBSD" && \
"$(OS)"!="DRAGONFLY" "$(OS)"!="DRAGONFLY"
APP1STDLIBS=-ldl APP1STDLIBS=-ldl
...@@ -60,7 +60,7 @@ APP1STDLIBS=-ldl ...@@ -60,7 +60,7 @@ APP1STDLIBS=-ldl
APP2TARGET = uri-encode APP2TARGET = uri-encode
APP2OBJS = $(OBJ)$/uri-encode.obj APP2OBJS = $(OBJ)$/uri-encode.obj
APP2LIBS = APP2LIBS =
APP2RPATH = BRAND APP2RPATH = OOO
APP2STDLIBS = APP2STDLIBS =
OBJFILES = $(APP1OBJS) $(APP2OBJS) OBJFILES = $(APP1OBJS) $(APP2OBJS)
......
shell/source/win32/simplemail/makefile.mk
Dosyayı görüntüle @ d03465a4
...@@ -70,7 +70,7 @@ APP1TARGET=senddoc ...@@ -70,7 +70,7 @@ APP1TARGET=senddoc
APP1OBJS=$(OBJFILES) APP1OBJS=$(OBJFILES)
APP1STDLIBS=$(KERNEL32LIB)\ APP1STDLIBS=$(KERNEL32LIB)\
$(SALLIB) $(SALLIB)
APP1RPATH = BRAND APP1RPATH = OOO
APP1DEF=$(MISC)$/$(APP1TARGET).def APP1DEF=$(MISC)$/$(APP1TARGET).def
# --- Targets ------------------------------------------------------ # --- Targets ------------------------------------------------------
......
solenv/bin/macosx-change-install-names.pl
Dosyayı görüntüle @ d03465a4
...@@ -33,9 +33,8 @@ sub action($$$) ...@@ -33,9 +33,8 @@ sub action($$$)
my %action = my %action =
('app/UREBIN/URELIB' => '@executable_path/../lib', ('app/UREBIN/URELIB' => '@executable_path/../lib',
'app/OOO/URELIB' => '@executable_path/../ure-link/lib', 'app/OOO/URELIB' => '@executable_path/../ure-link/lib',
'app/OOO/OOO' => '@executable_path',
'app/SDK/URELIB' => '@executable_path/../../ure-link/lib', 'app/SDK/URELIB' => '@executable_path/../../ure-link/lib',
'app/BRAND/URELIB' => '@executable_path/../ure-link/lib',
'app/BRAND/OOO' => '@executable_path',
'app/NONE/URELIB' => '@__VIA_LIBRARY_PATH__', 'app/NONE/URELIB' => '@__VIA_LIBRARY_PATH__',
'app/NONE/OOO' => '@__VIA_LIBRARY_PATH__', 'app/NONE/OOO' => '@__VIA_LIBRARY_PATH__',
'app/NONE/NONE' => '@__VIA_LIBRARY_PATH__', 'app/NONE/NONE' => '@__VIA_LIBRARY_PATH__',
...@@ -55,7 +54,7 @@ sub action($$$) ...@@ -55,7 +54,7 @@ sub action($$$)
} }
@ARGV == 3 || @ARGV >= 2 && $ARGV[0] eq "extshl" or die @ARGV == 3 || @ARGV >= 2 && $ARGV[0] eq "extshl" or die
'Usage: app|shl|extshl UREBIN|URELIB|OOO|SDK|BRAND|OXT|NONE|LOADER <filepath>*'; 'Usage: app|shl|extshl UREBIN|URELIB|OOO|SDK|OXT|NONE|LOADER <filepath>*';
$type = shift @ARGV; $type = shift @ARGV;
$loc = shift @ARGV; $loc = shift @ARGV;
if ($type eq "SharedLibrary") if ($type eq "SharedLibrary")
......
solenv/gbuild/Helper.mk
Dosyayı görüntüle @ d03465a4
...@@ -97,7 +97,7 @@ $(foreach repo,$(1),$(call gb_Helper_add_repository,$(repo))) ...@@ -97,7 +97,7 @@ $(foreach repo,$(1),$(call gb_Helper_add_repository,$(repo)))
endef endef
define gb_Helper_init_registries define gb_Helper_init_registries
gb_Executable_VALIDGROUPS := UREBIN SDK OOO BRAND NONE gb_Executable_VALIDGROUPS := UREBIN SDK OOO NONE
gb_Library_VALIDGROUPS := OOOLIBS PLAINLIBS_NONE PLAINLIBS_URE PLAINLIBS_OOO RTLIBS RTVERLIBS UNOLIBS_URE UNOLIBS_OOO UNOVERLIBS gb_Library_VALIDGROUPS := OOOLIBS PLAINLIBS_NONE PLAINLIBS_URE PLAINLIBS_OOO RTLIBS RTVERLIBS UNOLIBS_URE UNOLIBS_OOO UNOVERLIBS
gb_StaticLibrary_VALIDGROUPS := PLAINLIBS gb_StaticLibrary_VALIDGROUPS := PLAINLIBS
......
solenv/gbuild/platform/ios.mk
Dosyayı görüntüle @ d03465a4
...@@ -368,7 +368,6 @@ gb_Executable_LAYER := \ ...@@ -368,7 +368,6 @@ gb_Executable_LAYER := \
$(foreach exe,$(gb_Executable_UREBIN),$(exe):OOO) \ $(foreach exe,$(gb_Executable_UREBIN),$(exe):OOO) \
$(foreach exe,$(gb_Executable_SDK),$(exe):OOO) \ $(foreach exe,$(gb_Executable_SDK),$(exe):OOO) \
$(foreach exe,$(gb_Executable_OOO),$(exe):OOO) \ $(foreach exe,$(gb_Executable_OOO),$(exe):OOO) \
$(foreach exe,$(gb_Executable_BRAND),$(exe):OOO) \
$(foreach exe,$(gb_Executable_NONE),$(exe):OOO) \ $(foreach exe,$(gb_Executable_NONE),$(exe):OOO) \
......
solenv/gbuild/platform/macosx.mk
Dosyayı görüntüle @ d03465a4
...@@ -277,7 +277,6 @@ gb_LinkTarget__RPATHS := \ ...@@ -277,7 +277,6 @@ gb_LinkTarget__RPATHS := \
URELIB:@__________________________________________________URELIB/ \ URELIB:@__________________________________________________URELIB/ \
UREBIN: \ UREBIN: \
OOO:@__________________________________________________OOO/ \ OOO:@__________________________________________________OOO/ \
BRAND: \
SDKBIN: \ SDKBIN: \
NONE:@__VIA_LIBRARY_PATH__@ \ NONE:@__VIA_LIBRARY_PATH__@ \
...@@ -457,7 +456,6 @@ gb_Executable_LAYER := \ ...@@ -457,7 +456,6 @@ gb_Executable_LAYER := \
$(foreach exe,$(gb_Executable_UREBIN),$(exe):UREBIN) \ $(foreach exe,$(gb_Executable_UREBIN),$(exe):UREBIN) \
$(foreach exe,$(gb_Executable_SDK),$(exe):SDKBIN) \ $(foreach exe,$(gb_Executable_SDK),$(exe):SDKBIN) \
$(foreach exe,$(gb_Executable_OOO),$(exe):OOO) \ $(foreach exe,$(gb_Executable_OOO),$(exe):OOO) \
$(foreach exe,$(gb_Executable_BRAND),$(exe):BRAND) \
$(foreach exe,$(gb_Executable_NONE),$(exe):NONE) \ $(foreach exe,$(gb_Executable_NONE),$(exe):NONE) \
......
solenv/gbuild/platform/solaris.mk
Dosyayı görüntüle @ d03465a4
...@@ -191,7 +191,6 @@ gb_LinkTarget__RPATHS := \ ...@@ -191,7 +191,6 @@ gb_LinkTarget__RPATHS := \
URELIB:\dORIGIN \ URELIB:\dORIGIN \
UREBIN:\dORIGIN/../lib:\dORIGIN \ UREBIN:\dORIGIN/../lib:\dORIGIN \
OOO:\dORIGIN:\dORIGIN/../ure-link/lib \ OOO:\dORIGIN:\dORIGIN/../ure-link/lib \
BRAND:\dORIGIN:\dORIGIN/../ure-link/lib \
SDKBIN:\dORIGIN/../../ure-link/lib \ SDKBIN:\dORIGIN/../../ure-link/lib \
NONE:\dORIGIN/../lib:\dORIGIN \ NONE:\dORIGIN/../lib:\dORIGIN \
...@@ -326,7 +325,6 @@ gb_Executable_LAYER := \ ...@@ -326,7 +325,6 @@ gb_Executable_LAYER := \
$(foreach exe,$(gb_Executable_UREBIN),$(exe):UREBIN) \ $(foreach exe,$(gb_Executable_UREBIN),$(exe):UREBIN) \
$(foreach exe,$(gb_Executable_SDK),$(exe):SDKBIN) \ $(foreach exe,$(gb_Executable_SDK),$(exe):SDKBIN) \
$(foreach exe,$(gb_Executable_OOO),$(exe):OOO) \ $(foreach exe,$(gb_Executable_OOO),$(exe):OOO) \
$(foreach exe,$(gb_Executable_BRAND),$(exe):BRAND) \
$(foreach exe,$(gb_Executable_NONE),$(exe):NONE) \ $(foreach exe,$(gb_Executable_NONE),$(exe):NONE) \
......
solenv/gbuild/platform/unxgcc.mk
Dosyayı görüntüle @ d03465a4
...@@ -306,7 +306,6 @@ gb_LinkTarget__RPATHS := \ ...@@ -306,7 +306,6 @@ gb_LinkTarget__RPATHS := \
URELIB:\dORIGIN \ URELIB:\dORIGIN \
UREBIN:\dORIGIN/../lib:\dORIGIN \ UREBIN:\dORIGIN/../lib:\dORIGIN \
OOO:\dORIGIN:\dORIGIN/../ure-link/lib \ OOO:\dORIGIN:\dORIGIN/../ure-link/lib \
BRAND:\dORIGIN:\dORIGIN/../ure-link/lib \
SDKBIN:\dORIGIN/../../ure-link/lib \ SDKBIN:\dORIGIN/../../ure-link/lib \
NONE:\dORIGIN/../lib:\dORIGIN \ NONE:\dORIGIN/../lib:\dORIGIN \
...@@ -446,7 +445,6 @@ gb_Executable_LAYER := \ ...@@ -446,7 +445,6 @@ gb_Executable_LAYER := \
$(foreach exe,$(gb_Executable_UREBIN),$(exe):UREBIN) \ $(foreach exe,$(gb_Executable_UREBIN),$(exe):UREBIN) \
$(foreach exe,$(gb_Executable_SDK),$(exe):SDKBIN) \ $(foreach exe,$(gb_Executable_SDK),$(exe):SDKBIN) \
$(foreach exe,$(gb_Executable_OOO),$(exe):OOO) \ $(foreach exe,$(gb_Executable_OOO),$(exe):OOO) \
$(foreach exe,$(gb_Executable_BRAND),$(exe):BRAND) \
$(foreach exe,$(gb_Executable_NONE),$(exe):NONE) \ $(foreach exe,$(gb_Executable_NONE),$(exe):NONE) \
......
solenv/inc/settings.mk
Dosyayı görüntüle @ d03465a4
...@@ -1278,7 +1278,6 @@ LINKFLAGSRUNPATH_URELIB*= ...@@ -1278,7 +1278,6 @@ LINKFLAGSRUNPATH_URELIB*=
LINKFLAGSRUNPATH_UREBIN*= LINKFLAGSRUNPATH_UREBIN*=
LINKFLAGSRUNPATH_OOO*= LINKFLAGSRUNPATH_OOO*=
LINKFLAGSRUNPATH_SDK*= LINKFLAGSRUNPATH_SDK*=
LINKFLAGSRUNPATH_BRAND*=
LINKFLAGSRUNPATH_OXT*= LINKFLAGSRUNPATH_OXT*=
LINKFLAGSRUNPATH_NONE*= LINKFLAGSRUNPATH_NONE*=
......
solenv/inc/unxaigppc.mk
Dosyayı görüntüle @ d03465a4
...@@ -44,7 +44,6 @@ LINKFLAGSRUNPATH_URELIB:=-Wl,-blibpath:$(URELIBDIRS):/usr/lib:/lib ...@@ -44,7 +44,6 @@ LINKFLAGSRUNPATH_URELIB:=-Wl,-blibpath:$(URELIBDIRS):/usr/lib:/lib
LINKFLAGSRUNPATH_UREBIN:=-Wl,-blibpath:$(URELIBDIRS):$(UREBINDIRS):/usr/lib:/lib LINKFLAGSRUNPATH_UREBIN:=-Wl,-blibpath:$(URELIBDIRS):$(UREBINDIRS):/usr/lib:/lib
LINKFLAGSRUNPATH_OOO:=-Wl,-blibpath:$(BRANDPROGRAMDIRS):$(URELIBDIRS):/usr/lib:/lib LINKFLAGSRUNPATH_OOO:=-Wl,-blibpath:$(BRANDPROGRAMDIRS):$(URELIBDIRS):/usr/lib:/lib
LINKFLAGSRUNPATH_SDK:=-Wl,-blibpath:$(URELIBDIRS):/usr/lib:/lib LINKFLAGSRUNPATH_SDK:=-Wl,-blibpath:$(URELIBDIRS):/usr/lib:/lib
LINKFLAGSRUNPATH_BRAND:=-Wl,-blibpath:$(BRANDPROGRAMDIRS):$(URELIBDIRS):/usr/lib:/lib
LINKFLAGS:=-Wl,-brtl -Wl,-bnolibpath LINKFLAGS:=-Wl,-brtl -Wl,-bnolibpath
LINKFLAGSAPPGUI:= LINKFLAGSAPPGUI:=
......
solenv/inc/unxgcc.mk
Dosyayı görüntüle @ d03465a4
...@@ -177,7 +177,6 @@ LINKFLAGSRUNPATH_UREBIN=-Wl,-rpath,\''$$ORIGIN/../lib:$$ORIGIN'\',--enable-new-d ...@@ -177,7 +177,6 @@ LINKFLAGSRUNPATH_UREBIN=-Wl,-rpath,\''$$ORIGIN/../lib:$$ORIGIN'\',--enable-new-d
#TODO: drop $ORIGIN once no URE executable is also shipped in OOo #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_OOO=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\',--enable-new-dtags
LINKFLAGSRUNPATH_SDK=-Wl,-rpath,\''$$ORIGIN/../../ure-link/lib'\',--enable-new-dtags LINKFLAGSRUNPATH_SDK=-Wl,-rpath,\''$$ORIGIN/../../ure-link/lib'\',--enable-new-dtags
LINKFLAGSRUNPATH_BRAND=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\',--enable-new-dtags
LINKFLAGSRUNPATH_OXT= LINKFLAGSRUNPATH_OXT=
LINKFLAGSRUNPATH_NONE= LINKFLAGSRUNPATH_NONE=
# flag -Wl,-z,noexecstack sets the NX bit on the stack # flag -Wl,-z,noexecstack sets the NX bit on the stack
......
solenv/inc/unxmacx.mk
Dosyayı görüntüle @ d03465a4
...@@ -183,7 +183,6 @@ LINKFLAGSRUNPATH_URELIB=-install_name '@________________________________________ ...@@ -183,7 +183,6 @@ LINKFLAGSRUNPATH_URELIB=-install_name '@________________________________________
LINKFLAGSRUNPATH_UREBIN= LINKFLAGSRUNPATH_UREBIN=
LINKFLAGSRUNPATH_OOO=-install_name '@__________________________________________________OOO/$(@:f)' LINKFLAGSRUNPATH_OOO=-install_name '@__________________________________________________OOO/$(@:f)'
LINKFLAGSRUNPATH_SDK= LINKFLAGSRUNPATH_SDK=
LINKFLAGSRUNPATH_BRAND=
LINKFLAGSRUNPATH_OXT= LINKFLAGSRUNPATH_OXT=
LINKFLAGSRUNPATH_NONE=-install_name '@__________________________________________________NONE/$(@:f)' LINKFLAGSRUNPATH_NONE=-install_name '@__________________________________________________NONE/$(@:f)'
LINKFLAGS=$(LINKFLAGSDEFS) LINKFLAGS=$(LINKFLAGSDEFS)
......
solenv/inc/unxnbsd.mk
Dosyayı görüntüle @ d03465a4
...@@ -19,7 +19,6 @@ BUILD64=1 ...@@ -19,7 +19,6 @@ BUILD64=1
LINKFLAGSRUNPATH_UREBIN= LINKFLAGSRUNPATH_UREBIN=
LINKFLAGSRUNPATH_OOO= LINKFLAGSRUNPATH_OOO=
LINKFLAGSRUNPATH_SDK= LINKFLAGSRUNPATH_SDK=
LINKFLAGSRUNPATH_BRAND=
LINKFLAGSDEFS=-Wl,--ignore-unresolved-symbol,environ LINKFLAGSDEFS=-Wl,--ignore-unresolved-symbol,environ
LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS) LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS)
solenv/inc/unxsoli4.mk
Dosyayı görüntüle @ d03465a4
...@@ -132,7 +132,6 @@ LINKFLAGSRUNPATH_UREBIN=-R\''$$ORIGIN/../lib:$$ORIGIN'\' ...@@ -132,7 +132,6 @@ LINKFLAGSRUNPATH_UREBIN=-R\''$$ORIGIN/../lib:$$ORIGIN'\'
#TODO: drop $ORIGIN once no URE executable is also shipped in OOo #TODO: drop $ORIGIN once no URE executable is also shipped in OOo
LINKFLAGSRUNPATH_OOO=-R\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\' LINKFLAGSRUNPATH_OOO=-R\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\'
LINKFLAGSRUNPATH_SDK=-R\''$$ORIGIN/../../ure-link/lib'\' LINKFLAGSRUNPATH_SDK=-R\''$$ORIGIN/../../ure-link/lib'\'
LINKFLAGSRUNPATH_BRAND=-R\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\'
LINKFLAGSRUNPATH_OXT= LINKFLAGSRUNPATH_OXT=
LINKFLAGSRUNPATH_NONE= LINKFLAGSRUNPATH_NONE=
LINKFLAGS=-w -mt -z combreloc -PIC -temp=/tmp -norunpath -library=no%Cstd LINKFLAGS=-w -mt -z combreloc -PIC -temp=/tmp -norunpath -library=no%Cstd
......
solenv/inc/unxsols4.mk
Dosyayı görüntüle @ d03465a4
...@@ -138,7 +138,6 @@ LINKFLAGSRUNPATH_UREBIN=-R\''$$ORIGIN/../lib:$$ORIGIN'\' ...@@ -138,7 +138,6 @@ LINKFLAGSRUNPATH_UREBIN=-R\''$$ORIGIN/../lib:$$ORIGIN'\'
#TODO: drop $ORIGIN once no URE executable is also shipped in OOo #TODO: drop $ORIGIN once no URE executable is also shipped in OOo
LINKFLAGSRUNPATH_OOO=-R\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\' LINKFLAGSRUNPATH_OOO=-R\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\'
LINKFLAGSRUNPATH_SDK=-R\''$$ORIGIN/../../ure-link/lib'\' LINKFLAGSRUNPATH_SDK=-R\''$$ORIGIN/../../ure-link/lib'\'
LINKFLAGSRUNPATH_BRAND=-R\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\'
LINKFLAGSRUNPATH_OXT= LINKFLAGSRUNPATH_OXT=
LINKFLAGSRUNPATH_NONE= LINKFLAGSRUNPATH_NONE=
LINKFLAGS=-w -mt -z combreloc -PIC -temp=/tmp -norunpath -library=no%Cstd LINKFLAGS=-w -mt -z combreloc -PIC -temp=/tmp -norunpath -library=no%Cstd
......
solenv/inc/unxsolu4.mk
Dosyayı görüntüle @ d03465a4
...@@ -132,7 +132,6 @@ LINKFLAGSRUNPATH_URELIB=-R\''$$ORIGIN'\' ...@@ -132,7 +132,6 @@ LINKFLAGSRUNPATH_URELIB=-R\''$$ORIGIN'\'
LINKFLAGSRUNPATH_UREBIN=-R\''$$ORIGIN/../lib:$$ORIGIN'\' LINKFLAGSRUNPATH_UREBIN=-R\''$$ORIGIN/../lib:$$ORIGIN'\'
#TODO: drop $ORIGIN once no URE executable is also shipped in OOo #TODO: drop $ORIGIN once no URE executable is also shipped in OOo
LINKFLAGSRUNPATH_OOO=-R\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\' LINKFLAGSRUNPATH_OOO=-R\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\'
LINKFLAGSRUNPATH_BRAND=-R\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\'
LINKFLAGSRUNPATH_OXT= LINKFLAGSRUNPATH_OXT=
LINKFLAGSRUNPATH_NONE= LINKFLAGSRUNPATH_NONE=
LINKFLAGS=-m64 -w -mt -z combreloc -PIC -temp=/tmp -norunpath LINKFLAGS=-m64 -w -mt -z combreloc -PIC -temp=/tmp -norunpath
......
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