mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gbuild: remove now unused gb_Library_OUTDIRLOCATION

Browse Source 
Change-Id: I696b550b495d1bf6549e3c54a3157d467a7ead8d
This commit is contained in:
Matúš Kukan
2013-09-23 16:17:46 +02:00
parent a86a737a27
commit 94159a7ffd
3 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
solenv/gbuild/Library.mk
View File

@@ -21,7 +21,6 @@
# Library class
# defined globally in TargetLocations.mk
# gb_Library_OUTDIRLOCATION := $(OUTDIR)/lib
# gb_Library_DLLDIR := $(WORKDIR)/LinkTarget/Library
# defined by platform
# gb_Library_DEFS

2
solenv/gbuild/TargetLocations.mk
View File

@@ -432,8 +432,6 @@ gb_StaticLibrary_WORKDIR = $(WORKDIR)/LinkTarget/StaticLibrary
gb_Library_WORKDIR_FOR_BUILD = $(WORKDIR_FOR_BUILD)/LinkTarget/Library
gb_Executable_BINDIR = $(WORKDIR)/LinkTarget/Executable
gb_Executable_BINDIR_FOR_BUILD = $(WORKDIR_FOR_BUILD)/LinkTarget/Executable
# FIXME move platform
gb_Library_OUTDIRLOCATION = $(if $(filter WNT,$(OS)),$(OUTDIR)/bin,$(OUTDIR)/lib)
gb_Library_DLLDIR = $(WORKDIR)/LinkTarget/Library
gb_CppunitTest_DLLDIR = $(WORKDIR)/LinkTarget/CppunitTest

5
solenv/gbuild/platform/solaris.mk
View File

@@ -259,7 +259,6 @@ gb_Library_LAYER := \
$(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):URELIB) \
$(foreach lib,$(gb_Library_EXTENSIONLIBS),$(lib):OXT) \
#JAD#'-Wl,-rpath-link,$(gb_Library_OUTDIRLOCATION)'
define gb_Library__get_rpath
$(if $(1),$(strip '-Wl,-rpath,$(1)'))
endef
@@ -286,9 +285,7 @@ gb_Executable_LAYER := \
define gb_Executable__get_rpath
$(strip $(if $(1),'-Wl$(COMMA)-rpath$(COMMA)$(1)') \
-L$(gb_Library_OUTDIRLOCATION))
#JAD#-Wl,-rpath-link,$(gb_Library_OUTDIRLOCATION)
$(if $(1),'-Wl$(COMMA)-rpath$(COMMA)$(1)')
endef
define gb_Executable_get_rpath