diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk
index 5febb9784611..dd4228697cd4 100644
--- a/solenv/gbuild/Library.mk
+++ b/solenv/gbuild/Library.mk
@@ -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
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index f607ffec91de..5e16f4729305 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -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
 
diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk
index 4877af41e008..3f3891c76e88 100644
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@ -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