gbuild: remove obsolete SOLARLIB

Change-Id: I6fcf5ff3a8f543079c3c8d37a728eb0ba6e0587e

config_host.mk.in

@@ -468,7 +468,6 @@ export SDKDIRNAME=@SDKDIRNAME@
 export SDKDIRNAME_FOR_BUILD=@SDKDIRNAME_FOR_BUILD@
 export SHOWINCLUDES_PREFIX=@SHOWINCLUDES_PREFIX@
 export SOLARINC=@SOLARINC@
-export SOLARLIB=@SOLARLIB@
 export SPLIT_APP_MODULES=@SPLIT_APP_MODULES@
 export SPLIT_OPT_FEATURES=@SPLIT_OPT_FEATURES@
 export SRCDIR=@SRC_ROOT@

configure.ac

@@ -4293,7 +4293,6 @@ mingw*)
         AC_MSG_ERROR([Unsupported host_cpu $host_cpu for host_os $host_os])
         ;;
     esac
-
     ;;
 
 *netbsd*)
@@ -4356,8 +4355,6 @@ openbsd*)
         ;;
     esac
     SOLARINC="$SOLARINC -I/usr/local/include"
-    SOLARLIB="$SOLARLIB -L/usr/local/lib"
-
     ;;
 
 solaris*)
@@ -4392,8 +4389,6 @@ solaris*)
         ;;
     esac
     SOLARINC="$SOLARINC -I/usr/local/include"
-    SOLARLIB="$SOLARLIB -L$COMPATH/lib"
-    SOLARLIB="$SOLARLIB -L/usr/local/bin -L/usr/dt/lib -L/usr/openwin/lib"
     ;;
 
 *)
@@ -12660,7 +12655,6 @@ AC_SUBST(WIN_TOUCH)
 AC_SUBST(BUILD_TYPE)
 
 AC_SUBST(SOLARINC)
-AC_SUBST(SOLARLIB)
 
 PathFormat "$PERL"
 PERL="$formatted_path"

ios/qa/sc/Makefile

@@ -39,7 +39,7 @@ SRCS = filters-test.m
 
 CFLAGS = $(SOLARINC)
 
-LIBS = -Wl,$(WORKDIR)/LinkTarget/CppunitTest/libtest_sc_filters_test.a $(foreach LIB, bin/cppunit/cppunittester lib/bootstrap.uno lib/configmgr.uno lib/expwrap.uno lib/i18npool.uno lib/introspection.uno lib/reflection.uno lib/stocservices.uno lib/unobootstrapprotector lib/unoexceptionprotector, $(SOLARLIB) -lanalysislo -lavmedialo -lbasegfxlo -lcanvastoolslo -llcms2 -lcollator_data -lcomphelpgcc3 -lcppcanvaslo -lcppunit -lcrypto -ldatelo -ldict_ja -ldict_zh -ldrawinglayerlo -leditenglo -lexpat_xmlparse -lexpat_xmltok -lfilterconfiglo -lforlo -lforuilo -lfwelo -lfwilo -lfwklo -lgcc3_uno -li18nlangtaggcc3 -li18nutilgcc3 -licudata -licui18n -licuuc -lindex_data -ljpeg -ljvmfwk -llnglo -llocaledata_en -llocaledata_es -llocaledata_euro -llocaledata_others -lmsfilterlo -looxlo -lpackage2 -lreg -lsal_textenc -lsalcpprt -lsaxlo -lscfiltlo -lsclo -lsfxlo -lsotlo -lstore -lsvllo -lsvtlo -lsvxlo -lsvxcorelo -ltest -ltextconv_dict -ltklo -ltllo -lucb1 -lucbhelper4gcc3 -lucpfile1 -lunoxmllo -luno_cppuhelpergcc3 -luno_cppu -luno_sal -luno_salhelpergcc3 -lunotest -lutllo -lvcllo -lxmlscriptlo -lxml2 -lxmlreader -lxolo -lxstor -lz $(addprefix -framework , $(gb_Library__FRAMEWORKS)) -liconv -lobjc
+LIBS = -Wl,$(WORKDIR)/LinkTarget/CppunitTest/libtest_sc_filters_test.a $(foreach LIB, bin/cppunit/cppunittester lib/bootstrap.uno lib/configmgr.uno lib/expwrap.uno lib/i18npool.uno lib/introspection.uno lib/reflection.uno lib/stocservices.uno lib/unobootstrapprotector lib/unoexceptionprotector, -lanalysislo -lavmedialo -lbasegfxlo -lcanvastoolslo -llcms2 -lcollator_data -lcomphelpgcc3 -lcppcanvaslo -lcppunit -lcrypto -ldatelo -ldict_ja -ldict_zh -ldrawinglayerlo -leditenglo -lexpat_xmlparse -lexpat_xmltok -lfilterconfiglo -lforlo -lforuilo -lfwelo -lfwilo -lfwklo -lgcc3_uno -li18nlangtaggcc3 -li18nutilgcc3 -licudata -licui18n -licuuc -lindex_data -ljpeg -ljvmfwk -llnglo -llocaledata_en -llocaledata_es -llocaledata_euro -llocaledata_others -lmsfilterlo -looxlo -lpackage2 -lreg -lsal_textenc -lsalcpprt -lsaxlo -lscfiltlo -lsclo -lsfxlo -lsotlo -lstore -lsvllo -lsvtlo -lsvxlo -lsvxcorelo -ltest -ltextconv_dict -ltklo -ltllo -lucb1 -lucbhelper4gcc3 -lucpfile1 -lunoxmllo -luno_cppuhelpergcc3 -luno_cppu -luno_sal -luno_salhelpergcc3 -lunotest -lutllo -lvcllo -lxmlscriptlo -lxml2 -lxmlreader -lxolo -lxstor -lz $(addprefix -framework , $(gb_Library__FRAMEWORKS)) -liconv -lobjc
 
 all: $(APPDIR)/$(APP) stuff
 

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) \
 ))

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;

solenv/gbuild/gbuild.mk

@@ -26,7 +26,6 @@ GBUILDDIR:=$(SRCDIR)/solenv/gbuild
 # LIBXML_CFLAGS
 # OS
 # SOLARINC
-# SOLARLIB
 # UPD
 
 # PTHREAD_CFLAGS (Linux)

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

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

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

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 += \

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 += \