gbuild

Matúš Kukan Wed, 06 Mar 2013 03:48:15 -0800

 Makefile.in                             |   12 +++----
 config_host.mk.in                       |    2 -
 configure.ac                            |   52 +++++++-------------------------
 odk/CustomTarget_autodoc.mk             |    4 +-
 solenv/gbuild/CppunitTest.mk            |    2 -
 solenv/gbuild/LinkTarget.mk             |    2 -
 solenv/gbuild/Module.mk                 |    4 --
 solenv/gbuild/UnoApiTarget.mk           |    2 -
 solenv/gbuild/partial_build.mk          |    3 +
 solenv/gbuild/platform/IOS_ARM_GCC.mk   |    3 -
 solenv/gbuild/platform/WNT_INTEL_GCC.mk |    6 ---
 solenv/gbuild/platform/macosx.mk        |    7 ----
 solenv/gbuild/platform/solaris.mk       |    2 -
 solenv/gbuild/platform/unxgcc.mk        |    2 -
 14 files changed, 30 insertions(+), 73 deletions(-)


New commits:
commit ab70eb0c96311674aa9b628c5763fde960a78244
Author: MatÃºÅ¡ Kukan <matus.ku...@gmail.com>
Date:   Tue Mar 5 17:11:04 2013 +0100

    do not execute unit tests when cross-compiling
    
    For both build and host platform.
    
    Change-Id: I0fa9b5d85449887c2c6bd758fb1fecec9776d97c

diff --git a/Makefile.in b/Makefile.in
index 6316cd8..5144f6f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -222,7 +222,7 @@ build-nocheck: bootstrap fetch $(if $(filter 
$(INPATH),$(INPATH_FOR_BUILD)),,cro
        $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) -f 
$(SRCDIR)/Makefile.gbuild build
 
 cross-toolset: bootstrap fetch
-       $(GNUMAKE) gb_Side=build -j $(PARALLELISM) $(GMAKE_OPTIONS) -f 
$(SRCDIR)/Makefile.gbuild
+       $(GNUMAKE) gb_Side=build -j $(PARALLELISM) $(GMAKE_OPTIONS) -f 
$(SRCDIR)/Makefile.gbuild build
 
 #
 # Install
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index 30a1d9f..aa3900b 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -51,10 +51,8 @@ endif
 #  gb_CppunitTest_TARGETTYPE
 #  gb_CppunitTest_get_filename
 # DBGSV_ERROR_OUT => in non-product builds, ensure that tools-based assertions 
do not pop up as message box, but are routed to the shell
-ifneq ($(CROSS_COMPILING),YES)
 gb_CppunitTest_CPPTESTDEPS := $(call 
gb_Executable_get_runtime_dependencies,cppunit/cppunittester)
 gb_CppunitTest_CPPTESTCOMMAND := $(call 
gb_Executable_get_target_for_build,cppunit/cppunittester)
-endif
 
 gb_CppunitTest__get_linktargetname = CppunitTest/$(call 
gb_CppunitTest_get_filename,$(1))
 
diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk
index 80e90bb..2ef383a 100644
--- a/solenv/gbuild/Module.mk
+++ b/solenv/gbuild/Module.mk
@@ -92,7 +92,7 @@ $(call gb_Module_get_target,%) :
 .PHONY : all build unitcheck slowcheck subsequentcheck clean check debugrun 
help showmodules translations
 .DEFAULT_GOAL := all
 
-all : build unitcheck $(if $(gb_PARTIAL_BUILD),,slowcheck)
+all : build $(if $(CROSS_COMPILING),,unitcheck $(if 
$(gb_PARTIAL_BUILD),,slowcheck))
 
 build : 
        $(call gb_Output_announce,top level modules: $(foreach 
module,$(filter-out deliverlog $(WORKDIR)/bootstrap,$^),$(notdir 
$(module))),$(true),ALL,6)
diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk 
b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
index 533aef8..5686e06 100644
--- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
@@ -318,11 +318,7 @@ endef
 
 # CppunitTest class
 
-ifeq ($(CROSS_COMPILING),YES)
-gb_CppunitTest_CPPTESTPRECOMMAND := :
-else
 gb_CppunitTest_CPPTESTPRECOMMAND := $(gb_Helper_set_ld_path)
-endif
 gb_CppunitTest_SYSPRE := itest_
 gb_CppunitTest_EXT := .lib
 gb_CppunitTest_get_filename = $(gb_CppunitTest_SYSPRE)$(1)$(gb_CppunitTest_EXT)
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 4065fa0..c6717b0 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -304,12 +304,7 @@ endef
 
 # CppunitTest class
 
-ifeq ($(CROSS_COMPILING),YES)
-gb_CppunitTest_CPPTESTPRECOMMAND := :
-else
 gb_CppunitTest_CPPTESTPRECOMMAND := $(gb_Helper_set_ld_path)
-endif
-
 gb_CppunitTest_SYSPRE := libtest_
 gb_CppunitTest_EXT := .dylib
 gb_CppunitTest_LIBDIR := $(gb_Helper_OUTDIRLIBDIR)
commit 96409470b19d32a2310086b089542b333686f4da
Author: MatÃºÅ¡ Kukan <matus.ku...@gmail.com>
Date:   Tue Mar 5 17:03:04 2013 +0100

    reintroduce gb_PARTIAL_BUILD to know if we want to run slowcheck
    
    Also kills horrible SKIP_TESTS hack along the way.
    
    Change-Id: Ida59fb44d247b52ef11ee7ba5e4e006996a87ebf

diff --git a/Makefile.in b/Makefile.in
index 633fed1..6316cd8 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -216,10 +216,10 @@ bootstrap: compilerplugins
 # Build
 #
 build: bootstrap fetch $(if $(filter 
$(INPATH),$(INPATH_FOR_BUILD)),,cross-toolset)
-       $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) -f 
$(SRCDIR)/Makefile.gbuild all slowcheck
+       $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) -f 
$(SRCDIR)/Makefile.gbuild
 
-build-nocheck : export SKIP_TESTS := YES
-build-nocheck : build
+build-nocheck: bootstrap fetch $(if $(filter 
$(INPATH),$(INPATH_FOR_BUILD)),,cross-toolset)
+       $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) -f 
$(SRCDIR)/Makefile.gbuild build
 
 cross-toolset: bootstrap fetch
        $(GNUMAKE) gb_Side=build -j $(PARALLELISM) $(GMAKE_OPTIONS) -f 
$(SRCDIR)/Makefile.gbuild
@@ -325,8 +325,8 @@ else ifeq ($(OS),MACOSX)
        @echo "To debug: gdb install/LibreOffice.app/Contents/MacOS/soffice"
 endif
 
-dev-install-nocheck : export SKIP_TESTS := YES
-dev-install-nocheck : dev-install
+dev-install-nocheck: build-nocheck
+       $(MAKE) dev-install -o build
 
 dev-update:
 ifeq ($(DISABLE_LINKOO),TRUE)
diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk
index 0e694e5..80e90bb 100644
--- a/solenv/gbuild/Module.mk
+++ b/solenv/gbuild/Module.mk
@@ -92,7 +92,7 @@ $(call gb_Module_get_target,%) :
 .PHONY : all build unitcheck slowcheck subsequentcheck clean check debugrun 
help showmodules translations
 .DEFAULT_GOAL := all
 
-all : build unitcheck
+all : build unitcheck $(if $(gb_PARTIAL_BUILD),,slowcheck)
 
 build : 
        $(call gb_Output_announce,top level modules: $(foreach 
module,$(filter-out deliverlog $(WORKDIR)/bootstrap,$^),$(notdir 
$(module))),$(true),ALL,6)
@@ -197,7 +197,6 @@ $(call gb_Module_get_clean_target,$(1)) : 
$$(gb_Module_CURRENTCLEANTARGET)
 
 endef
 
-ifeq ($(strip $(SKIP_TESTS)),)
 define gb_Module_add_check_target
 $(call gb_Module__read_targetfile,$(1),$(2),check target)
 
@@ -213,7 +212,6 @@ $(call gb_Module_get_slowcheck_target,$(1)) : 
$$(gb_Module_CURRENTTARGET)
 $(call gb_Module_get_clean_target,$(1)) : $$(gb_Module_CURRENTCLEANTARGET)
 
 endef
-endif # SKIP_TESTS
 
 define gb_Module_add_subsequentcheck_target
 $(call gb_Module__read_targetfile,$(1),$(2),subsequentcheck target)
diff --git a/solenv/gbuild/partial_build.mk b/solenv/gbuild/partial_build.mk
index aa7def4..9c7f3fb 100644
--- a/solenv/gbuild/partial_build.mk
+++ b/solenv/gbuild/partial_build.mk
@@ -5,6 +5,7 @@ ifeq ($(SOLARENV),)
 include $(dir $(realpath $(lastword 
$(MAKEFILE_LIST))))../../config_$(gb_Side).mk
 endif
 
+gb_PARTIAL_BUILD := T
 include $(SOLARENV)/gbuild/gbuild.mk
 
-$(eval $(call gb_Module_make_global_targets,$(shell ls 
$(module_directory)/Module*.mk)))
+$(eval $(call gb_Module_make_global_targets,$(wildcard 
$(module_directory)/Module*.mk)))
commit 076eaea23c1c9992499399504c90fd00d83f1539
Author: MatÃºÅ¡ Kukan <matus.ku...@gmail.com>
Date:   Tue Mar 5 11:21:57 2013 +0100

    gbuild: use proper dependencies for concat-deps
    
    Change-Id: I132d63807cd49905a38cb8e38d887c5634a1f01f

diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index b39f478..351a46c 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -449,7 +449,7 @@ $(call gb_LinkTarget_get_target,%) : $(call 
gb_LinkTarget_get_headers_target,%)
        $(call gb_LinkTarget__command_objectlist,$@,$*)
 
 ifeq ($(gb_FULLDEPS),$(true))
-$(call gb_LinkTarget_get_dep_target,%) : $(call 
gb_Package_get_target,solenv_concat-deps)
+$(call gb_LinkTarget_get_dep_target,%) : $(call 
gb_Executable_get_runtime_dependencies,concat-deps)
 
        $(call 
gb_LinkTarget__command_dep,$@,$*,$(COBJECTS),$(CXXOBJECTS),$(OBJCOBJECTS),$(OBJCXXOBJECTS),$(ASMOBJECTS),$(GENCOBJECTS),$(GENCXXOBJECTS))
 endif
diff --git a/solenv/gbuild/UnoApiTarget.mk b/solenv/gbuild/UnoApiTarget.mk
index 4d944ae..29d8fd7 100644
--- a/solenv/gbuild/UnoApiTarget.mk
+++ b/solenv/gbuild/UnoApiTarget.mk
@@ -153,7 +153,7 @@ endef
 
 ifeq ($(gb_FULLDEPS),$(true))
 
-$(call gb_UnoApiTarget_get_dep_target,%) : $(call 
gb_Package_get_target,solenv_concat-deps)
+$(call gb_UnoApiTarget_get_dep_target,%) : $(call 
gb_Executable_get_runtime_dependencies,concat-deps)
        $(call gb_UnoApiTarget__command_dep,$@,$*,$(UNOAPI_IDLFILES))
 
 endif
commit 9e1806b81f5e404320002c66d8dead3af1e0e5ba
Author: MatÃºÅ¡ Kukan <matus.ku...@gmail.com>
Date:   Tue Mar 5 09:55:45 2013 +0100

    odk: use proper gbuild functions; helps cross-compilation
    
    Change-Id: I7529c4a3ad52cddcab0198e9fd4f2d7b42584dec

diff --git a/odk/CustomTarget_autodoc.mk b/odk/CustomTarget_autodoc.mk
index 951183a..847ed9a 100644
--- a/odk/CustomTarget_autodoc.mk
+++ b/odk/CustomTarget_autodoc.mk
@@ -14,9 +14,9 @@ odkcommon_ZIPLIST += docs/common/ref
 $(eval $(call 
gb_CustomTarget_register_target,odk/odkcommon/docs/common/ref,module-ix.html))
 $(odk_WORKDIR)/docs/common/ref/module-ix.html: 
$(SRCDIR)/odk/pack/copying/idl_chapter_refs.txt \
        $(SRCDIR)/odk/docs/common/ref/idl.css $(call 
gb_UnoApi_get_target,offapi) \
-       $(call gb_Executable_get_target,autodoc)
+       $(call gb_Executable_get_runtime_dependencies,autodoc)
        $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),AUD,1)
-       $(call gb_Executable_get_target,autodoc) -html $(dir $@) \
+       $(call gb_Helper_execute,autodoc) -html $(dir $@) \
                -dvgroot "http://wiki.services.openoffice.org/wiki"; \
                -name "LibreOffice $(PRODUCTVERSION) API" \
                -lg idl -dvgfile $< -t $(OUTDIR)/idl
commit be46157bb2436798cba163983f98107faa1553b8
Author: MatÃºÅ¡ Kukan <matus.ku...@gmail.com>
Date:   Tue Mar 5 09:34:49 2013 +0100

    clean SOLARLIB post dmake removal
    
    I think it should die completely but openbsd and solaris still use it.
    Probably just setting LDFLAGS should be enough for them ?
    
    Also SOLARINC_FOR_BUILD and SOLARLIB_FOR_BUILD are not used anywhere.
    
    Change-Id: I1c11981f859876af8b90e8ba60fce2820b354022

diff --git a/config_host.mk.in b/config_host.mk.in
index c3d97d6..cd0fc37 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -492,9 +492,7 @@ export SERVLETAPI_JAR=@SERVLETAPI_JAR@
 export SHOWINCLUDES_PREFIX=@SHOWINCLUDES_PREFIX@
 export SOLARENV=@SRC_ROOT@/solenv
 export SOLARINC=@SOLARINC@
-export SOLARINC_FOR_BUILD=@SOLARINC_FOR_BUILD@
 export SOLARLIB=@SOLARLIB@
-export SOLARLIB_FOR_BUILD=@SOLARLIB_FOR_BUILD@
 export SOLARVER=@SOLARVER@
 export SOLARVERSION=@SOLARVER@
 export SOLAR_JAVA=@SOLAR_JAVA@
diff --git a/configure.ac b/configure.ac
index 257ea34..7b04705 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3375,9 +3375,7 @@ aix*)
     PLATFORMID=aix_powerpc
     OUTPATH=unxaigppc
     P_SEP=:
-    SOLARLIB="-L../lib -L$SRC_ROOT/solenv/$OUTPATH/lib"
-    SOLARLIB="$SOLARLIB -L${SOLARVER}/${OUTPATH}${PROEXT}/lib"
-    SOLARLIB="$SOLARLIB -L$SRC_ROOT/solenv/$OUTPATH/lib"
+    SOLARLIB="-L${SOLARVER}/${OUTPATH}${PROEXT}/lib"
     ;;
 
 cygwin*)
@@ -3410,8 +3408,7 @@ cygwin*)
         ;;
     esac
     SCPDEFS="$SCPDEFS -D_MSC_VER"
-    SOLARLIB="-L../lib -L$SRC_ROOT/solenv/$OUTPATH/lib"
-    SOLARLIB="$SOLARLIB -L${SOLARVER}/${OUTPATH}${PROEXT}/lib"
+    SOLARLIB="-L${SOLARVER}/${OUTPATH}${PROEXT}/lib"
     ;;
 
 darwin*)
@@ -3496,9 +3493,7 @@ dragonfly*)
         AC_MSG_ERROR([Unsupported host_cpu $host_cpu for host_os $host_os])
         ;;
     esac
-    SOLARLIB="-L../lib -L$SRC_ROOT/solenv/$OUTPATH/lib"
-    SOLARLIB="$SOLARLIB -L${SOLARVER}/${OUTPATH}${PROEXT}/lib"
-    SOLARLIB="$SOLARLIB -L$SRC_ROOT/solenv/$OUTPATH/lib"
+    SOLARLIB="-L${SOLARVER}/${OUTPATH}${PROEXT}/lib"
     ;;
 
 freebsd*)
@@ -3528,9 +3523,7 @@ freebsd*)
         AC_MSG_ERROR([Unsupported host_cpu $host_cpu for host_os $host_os])
         ;;
     esac
-    SOLARLIB="-L../lib -L$SRC_ROOT/solenv/$OUTPATH/lib"
-    SOLARLIB="$SOLARLIB -L${SOLARVER}/${OUTPATH}${PROEXT}/lib"
-    SOLARLIB="$SOLARLIB -L$SRC_ROOT/solenv/$OUTPATH/lib"
+    SOLARLIB="-L${SOLARVER}/${OUTPATH}${PROEXT}/lib"
     ;;
 
 kfreebsd*)
@@ -3562,9 +3555,7 @@ kfreebsd*)
         AC_MSG_ERROR([Unsupported host_cpu $host_cpu for host_os $host_os])
         ;;
     esac
-    SOLARLIB="-L../lib -L$SRC_ROOT/solenv/$OUTPATH/lib"
-    SOLARLIB="$SOLARLIB -L${SOLARVER}/${OUTPATH}${PROEXT}/lib"
-    SOLARLIB="$SOLARLIB -L$SRC_ROOT/solenv/$OUTPATH/lib"
+    SOLARLIB="-L${SOLARVER}/${OUTPATH}${PROEXT}/lib"
     ;;
 
 linux-gnu*)
@@ -3708,9 +3699,7 @@ linux-gnu*)
         AC_MSG_ERROR([Unsupported host_cpu $host_cpu for host_os $host_os])
         ;;
     esac
-    SOLARLIB="-L../lib -L$SRC_ROOT/solenv/$OUTPATH/lib"
-    SOLARLIB="$SOLARLIB -L${SOLARVER}/${OUTPATH}${PROEXT}/lib"
-    SOLARLIB="$SOLARLIB -L$SRC_ROOT/solenv/$OUTPATH/lib"
+    SOLARLIB="-L${SOLARVER}/${OUTPATH}${PROEXT}/lib"
     ;;
 
 linux-android*)
@@ -3781,8 +3770,7 @@ mingw*)
         ;;
     esac
     SOLARINC="$SOLARINC -I$SRC_ROOT/solenv/inc/win32 
-I$SRC_ROOT/solenv/inc/$OUTPATH"
-    SOLARLIB="-L../lib -L$SRC_ROOT/solenv/$OUTPATH/lib"
-    SOLARLIB="$SOLARLIB -L${SOLARVER}/${OUTPATH}${PROEXT}/lib"
+    SOLARLIB="-L${SOLARVER}/${OUTPATH}${PROEXT}/lib"
     ;;
 
 *netbsd*)
@@ -3824,9 +3812,7 @@ mingw*)
         AC_MSG_ERROR([Unsupported host_cpu $host_cpu for host_os $host_os])
         ;;
     esac
-    SOLARLIB="-L../lib -L$SRC_ROOT/solenv/$OUTPATH/lib"
-    SOLARLIB="$SOLARLIB -L${SOLARVER}/${OUTPATH}${PROEXT}/lib"
-    SOLARLIB="$SOLARLIB -L$SRC_ROOT/solenv/$OUTPATH/lib"
+    SOLARLIB="-L${SOLARVER}/${OUTPATH}${PROEXT}/lib"
     ;;
 
 openbsd*)
@@ -3856,9 +3842,7 @@ openbsd*)
         ;;
     esac
     SOLARINC="$SOLARINC -I/usr/local/include"
-    SOLARLIB="-L../lib -L$SRC_ROOT/solenv/$OUTPATH/lib"
-    SOLARLIB="$SOLARLIB -L${SOLARVER}/${OUTPATH}${PROEXT}/lib"
-    SOLARLIB="$SOLARLIB -L$SRC_ROOT/solenv/$OUTPATH/lib"
+    SOLARLIB="-L${SOLARVER}/${OUTPATH}${PROEXT}/lib"
     SOLARLIB="$SOLARLIB -L/usr/local/lib"
 
     ;;
@@ -3892,9 +3876,7 @@ solaris*)
         ;;
     esac
     SOLARINC="$SOLARINC -I/usr/local/include"
-    SOLARLIB="-L../lib -L$SRC_ROOT/solenv/$OUTPATH/lib"
-    SOLARLIB="$SOLARLIB -L${SOLARVER}/${OUTPATH}${PROEXT}/lib"
-    SOLARLIB="$SOLARLIB -L$SRC_ROOT/solenv/$OUTPATH/lib"
+    SOLARLIB="-L${SOLARVER}/${OUTPATH}${PROEXT}/lib"
     SOLARLIB="$SOLARLIB -L$COMPATH/lib"
     SOLARLIB="$SOLARLIB -L/usr/local/bin -L/usr/dt/lib -L/usr/openwin/lib"
     ;;
@@ -4094,7 +4076,7 @@ if test "$cross_compiling" = "yes"; then
     cp config.log ../config.Build.log
     mkdir -p ../config_build
     cp config_host/*.h ../config_build
-    . ./bin/get_config_variables COM GUI OS PATH CPU CPUNAME CC CXX 
DISABLE_PYTHON MACOSX_DEPLOYMENT_TARGET INPATH OUTPATH PYTHON SYSTEM_LIBXSLT 
OUTDIR SOLARINC SOLARLIB WORKDIR
+    . ./bin/get_config_variables COM GUI OS PATH CPU CPUNAME CC CXX 
DISABLE_PYTHON MACOSX_DEPLOYMENT_TARGET INPATH OUTPATH PYTHON SYSTEM_LIBXSLT 
OUTDIR WORKDIR
 
     for V in COM GUI OS CPU CPUNAME CC CXX DISABLE_PYTHON 
MACOSX_DEPLOYMENT_TARGET INPATH OUTPATH \
              PYTHON SYSTEM_LIBXSLT; do
@@ -4106,7 +4088,7 @@ if test "$cross_compiling" = "yes"; then
         fi
     done
 
-    for V in OUTDIR SOLARINC SOLARLIB WORKDIR; do
+    for V in OUTDIR WORKDIR; do
         VV='$'$V
         VV=`eval "echo $VV"`
         VV=`echo $VV | sed -e 's,/CONF-FOR-BUILD,,g'`
@@ -11769,16 +11751,6 @@ AC_SUBST(BUILD_TYPE)
 AC_SUBST(SOLARINC)
 AC_SUBST(SOLARLIB)
 
-if test -z "$SOLARINC_FOR_BUILD"; then
-    SOLARINC_FOR_BUILD="$SOLARINC"
-fi
-AC_SUBST(SOLARINC_FOR_BUILD)
-
-if test -z "$SOLARLIB_FOR_BUILD"; then
-    SOLARLIB_FOR_BUILD="$SOLARLIB"
-fi
-AC_SUBST(SOLARLIB_FOR_BUILD)
-
 PathFormat "$PERL"
 PERL="$formatted_path"
 AC_SUBST(PERL)
diff --git a/solenv/gbuild/platform/IOS_ARM_GCC.mk 
b/solenv/gbuild/platform/IOS_ARM_GCC.mk
index e29a9bf..1a3737e 100644
--- a/solenv/gbuild/platform/IOS_ARM_GCC.mk
+++ b/solenv/gbuild/platform/IOS_ARM_GCC.mk
@@ -75,8 +75,7 @@ gb_OBJCFLAGS := -x objective-c $(gb_OBJC_OBJCXX_COMMON_FLAGS)
 gb_COMPILERDEFS += \
                -DBOOST_DETAIL_NO_CONTAINER_FWD
 
-gb_LinkTarget_LDFLAGS := \
-       $(subst -L../lib , ,$(SOLARLIB)) \
+gb_LinkTarget_LDFLAGS := $(SOLARLIB) \
 #man ld says: obsolete -Wl,-multiply_defined,suppress \
 
 gb_DEBUG_CFLAGS := -g -fno-inline
diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk 
b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
index b70e84b..533aef8 100644
--- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
@@ -95,7 +95,7 @@ gb_LinkTarget_LDFLAGS := \
        -Wl,--exclude-symbols,__main \
        -Wl,--enable-stdcall-fixup \
        -Wl,--enable-runtime-pseudo-reloc-v2 \
-       $(subst -L../lib , ,$(SOLARLIB)) \
+       $(SOLARLIB) \
 
 ifeq ($(MINGW_GCCLIB_EH),YES)
 gb_LinkTarget_LDFLAGS += -shared-libgcc
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index c770d90..4065fa0 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -89,7 +89,7 @@ gb_OBJCFLAGS := -x objective-c -fobjc-exceptions
 
 gb_LinkTarget_LDFLAGS := \
        $(if $(filter 1040 
1050,$(MAC_OS_X_VERSION_MIN_REQUIRED)),-Wl$(COMMA)-syslibroot$(COMMA)$(gb_SDKDIR))
 \
-       $(subst -L../lib , ,$(SOLARLIB)) \
+       $(SOLARLIB) \
 #man ld says: obsolete -Wl,-multiply_defined,suppress \
 
 gb_DEBUG_CFLAGS := -g
diff --git a/solenv/gbuild/platform/solaris.mk 
b/solenv/gbuild/platform/solaris.mk
index d7a14c5..1cc130c 100644
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@ -125,7 +125,7 @@ gb_LinkTarget_LDFLAGS += \
        -L$(SYSBASE)/lib \
        -L$(SYSBASE)/usr/lib \
        -Wl,-z,combreloc \
-       $(subst -L../lib , ,$(SOLARLIB)) \
+       $(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 63aafda..5f32825 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -120,7 +120,7 @@ endif
 gb_LinkTarget_LDFLAGS += \
        -Wl,-rpath-link,$(SYSBASE)/lib:$(SYSBASE)/usr/lib \
        -Wl,-z,combreloc \
-       $(subst -L../lib , ,$(SOLARLIB)) \
+       $(SOLARLIB) \
 
 ifeq ($(HAVE_LD_HASH_STYLE),TRUE)
 gb_LinkTarget_LDFLAGS += \

_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 5 commits - config_host.mk.in configure.ac Makefile.in odk/CustomTarget_autodoc.mk solenv/gbuild

Reply via email to