summaryrefslogtreecommitdiff
path: root/solenv
diff options
context:
space:
mode:
authorMatúš Kukan <matus.kukan@gmail.com>2013-09-23 16:28:20 +0200
committerMatúš Kukan <matus.kukan@collabora.com>2013-12-17 21:31:15 +0100
commit975f62aeaa0c88cca1b7926ff34df1d7afb577c4 (patch)
tree103c642fd1627942e98fd1ca5f8efa2f015e17c5 /solenv
parent669c282fea83c44d545fa8c1bfe03fa45568c35b (diff)
gbuild: remove obsolete SOLARLIB
Change-Id: I6fcf5ff3a8f543079c3c8d37a728eb0ba6e0587e
Diffstat (limited to 'solenv')
-rw-r--r--solenv/Executable_concat-deps.mk5
-rw-r--r--solenv/doc/gbuild/solenv/gbuild/gbuild.mk1
-rw-r--r--solenv/gbuild/gbuild.mk1
-rw-r--r--solenv/gbuild/platform/IOS_ARM_GCC.mk3
-rw-r--r--solenv/gbuild/platform/macosx.mk3
-rw-r--r--solenv/gbuild/platform/mingw.mk1
-rw-r--r--solenv/gbuild/platform/solaris.mk1
-rw-r--r--solenv/gbuild/platform/unxgcc.mk1
8 files changed, 0 insertions, 16 deletions
diff --git a/solenv/Executable_concat-deps.mk b/solenv/Executable_concat-deps.mk
index f376c7c566d4..a69b75717c50 100644
--- a/solenv/Executable_concat-deps.mk
+++ b/solenv/Executable_concat-deps.mk
@@ -9,11 +9,6 @@
$(eval $(call gb_Executable_Executable,concat-deps))
-ifneq ($(OS),WNT)
-$(eval $(call gb_Executable_set_ldflags,concat-deps,\
- $(filter-out $(SOLARLIB),$$(LDFLAGS))))
-endif
-
$(eval $(call gb_Executable_add_cobjects,concat-deps,\
solenv/bin/concat-deps, $(gb_COMPILEROPTFLAGS) \
))
diff --git a/solenv/doc/gbuild/solenv/gbuild/gbuild.mk b/solenv/doc/gbuild/solenv/gbuild/gbuild.mk
index 647a860c636a..bf89091b9a61 100644
--- a/solenv/doc/gbuild/solenv/gbuild/gbuild.mk
+++ b/solenv/doc/gbuild/solenv/gbuild/gbuild.mk
@@ -30,7 +30,6 @@ static Path WORKDIR;
// Expected from configure/environment
static const Integer OSL_DEBUG_LEVEL;
static const List<Path> SOLARINC;
-static const List<Path> SOLARLIB;
static const Path GBUILDDIR;
static const Path JAVA_HOME;
static const Path UPD;
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 0796f8ba2541..60c1c0272750 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -26,7 +26,6 @@ GBUILDDIR:=$(SRCDIR)/solenv/gbuild
# LIBXML_CFLAGS
# OS
# SOLARINC
-# SOLARLIB
# UPD
# PTHREAD_CFLAGS (Linux)
diff --git a/solenv/gbuild/platform/IOS_ARM_GCC.mk b/solenv/gbuild/platform/IOS_ARM_GCC.mk
index 59923e907e53..ffcc1e9b3628 100644
--- a/solenv/gbuild/platform/IOS_ARM_GCC.mk
+++ b/solenv/gbuild/platform/IOS_ARM_GCC.mk
@@ -68,9 +68,6 @@ gb_OBJCFLAGS := -x objective-c $(gb_OBJC_OBJCXX_COMMON_FLAGS)
gb_COMPILERDEFS += \
-DBOOST_DETAIL_NO_CONTAINER_FWD
-gb_LinkTarget_LDFLAGS := $(SOLARLIB) \
-#man ld says: obsolete -Wl,-multiply_defined,suppress \
-
gb_DEBUG_CFLAGS := -g -fno-inline
# LinkTarget class
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index c46cba10511f..96f56c26aeef 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -82,9 +82,6 @@ gb_OBJCXXFLAGS := -x objective-c++ -fobjc-exceptions
gb_OBJCFLAGS := -x objective-c -fobjc-exceptions
-gb_LinkTarget_LDFLAGS := \
- $(SOLARLIB) \
-
# LinkTarget class
define gb_LinkTarget__get_rpath_for_layer
diff --git a/solenv/gbuild/platform/mingw.mk b/solenv/gbuild/platform/mingw.mk
index 58f834a2f20c..72b9fc13a3c5 100644
--- a/solenv/gbuild/platform/mingw.mk
+++ b/solenv/gbuild/platform/mingw.mk
@@ -65,7 +65,6 @@ gb_LinkTarget_LDFLAGS := \
-Wl,--exclude-symbols,__main \
-Wl,--enable-stdcall-fixup \
-Wl,--enable-runtime-pseudo-reloc-v2 \
- $(SOLARLIB) \
ifeq ($(MINGW_GCCLIB_EH),YES)
gb_LinkTarget_LDFLAGS += -shared-libgcc
diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk
index 2115a4a90082..2311ab647769 100644
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@ -117,7 +117,6 @@ gb_LinkTarget_LDFLAGS += \
-L$(SYSBASE)/lib \
-L$(SYSBASE)/usr/lib \
-Wl,-z,combreloc \
- $(SOLARLIB) \
ifeq ($(HAVE_LD_HASH_STYLE),TRUE)
gb_LinkTarget_LDFLAGS += \
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index 75d5d21ab4d6..151cc86202d2 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -112,7 +112,6 @@ endif
gb_LinkTarget_LDFLAGS += \
-Wl,-rpath-link,$(SYSBASE)/lib:$(SYSBASE)/usr/lib \
-Wl,-z,combreloc \
- $(SOLARLIB) \
ifeq ($(HAVE_LD_HASH_STYLE),TRUE)
gb_LinkTarget_LDFLAGS += \