Kaydet (Commit) 94159a7f authored tarafından Matúš Kukan's avatar Matúš Kukan

gbuild: remove now unused gb_Library_OUTDIRLOCATION

Change-Id: I696b550b495d1bf6549e3c54a3157d467a7ead8d
üst a86a737a
...@@ -21,7 +21,6 @@ ...@@ -21,7 +21,6 @@
# Library class # Library class
# defined globally in TargetLocations.mk # defined globally in TargetLocations.mk
# gb_Library_OUTDIRLOCATION := $(OUTDIR)/lib
# gb_Library_DLLDIR := $(WORKDIR)/LinkTarget/Library # gb_Library_DLLDIR := $(WORKDIR)/LinkTarget/Library
# defined by platform # defined by platform
# gb_Library_DEFS # gb_Library_DEFS
......
...@@ -432,8 +432,6 @@ gb_StaticLibrary_WORKDIR = $(WORKDIR)/LinkTarget/StaticLibrary ...@@ -432,8 +432,6 @@ gb_StaticLibrary_WORKDIR = $(WORKDIR)/LinkTarget/StaticLibrary
gb_Library_WORKDIR_FOR_BUILD = $(WORKDIR_FOR_BUILD)/LinkTarget/Library gb_Library_WORKDIR_FOR_BUILD = $(WORKDIR_FOR_BUILD)/LinkTarget/Library
gb_Executable_BINDIR = $(WORKDIR)/LinkTarget/Executable gb_Executable_BINDIR = $(WORKDIR)/LinkTarget/Executable
gb_Executable_BINDIR_FOR_BUILD = $(WORKDIR_FOR_BUILD)/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_Library_DLLDIR = $(WORKDIR)/LinkTarget/Library
gb_CppunitTest_DLLDIR = $(WORKDIR)/LinkTarget/CppunitTest gb_CppunitTest_DLLDIR = $(WORKDIR)/LinkTarget/CppunitTest
......
...@@ -259,7 +259,6 @@ gb_Library_LAYER := \ ...@@ -259,7 +259,6 @@ gb_Library_LAYER := \
$(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):URELIB) \ $(foreach lib,$(gb_Library_UNOVERLIBS),$(lib):URELIB) \
$(foreach lib,$(gb_Library_EXTENSIONLIBS),$(lib):OXT) \ $(foreach lib,$(gb_Library_EXTENSIONLIBS),$(lib):OXT) \
#JAD#'-Wl,-rpath-link,$(gb_Library_OUTDIRLOCATION)'
define gb_Library__get_rpath define gb_Library__get_rpath
$(if $(1),$(strip '-Wl,-rpath,$(1)')) $(if $(1),$(strip '-Wl,-rpath,$(1)'))
endef endef
...@@ -286,9 +285,7 @@ gb_Executable_LAYER := \ ...@@ -286,9 +285,7 @@ gb_Executable_LAYER := \
define gb_Executable__get_rpath define gb_Executable__get_rpath
$(strip $(if $(1),'-Wl$(COMMA)-rpath$(COMMA)$(1)') \ $(if $(1),'-Wl$(COMMA)-rpath$(COMMA)$(1)')
-L$(gb_Library_OUTDIRLOCATION))
#JAD#-Wl,-rpath-link,$(gb_Library_OUTDIRLOCATION)
endef endef
define gb_Executable_get_rpath define gb_Executable_get_rpath
......
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