diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2014-07-01 12:13:07 +0000 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-07-08 10:34:08 +0000 |
| commit | a89b8601ce7be0b6dc3f262661ea7802f2c725fd (patch) | |
| tree | fa730b272c1ad445057ddcf29bcfc4aa5a5c289a /solenv | |
| parent | 2768d78391b0892ae1506687cfccdcc9c018077c (diff) | |
auto-detect the presence of a native gmake on windows
Change-Id: Ie1c7e022a2e1713a111ebd2db9db866e09f4f4f4
Reviewed-on: https://gerrit.libreoffice.org/10120
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/gbuild.mk | 4 | ||||
| -rw-r--r-- | solenv/gbuild/platform/com_MSC_class.mk | 5 | ||||
| -rw-r--r-- | solenv/gbuild/platform/com_MSC_defs.mk | 10 |
3 files changed, 18 insertions, 1 deletions
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index 4eed76eebfc6..0ef0a505a352 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -53,10 +53,14 @@ ifdef gb_SHELL SHELL := $(gb_SHELL) else ifeq ($(OS_FOR_BUILD),WNT) +ifeq ($(GNUMAKE_WIN_NATIVE),TRUE) SHELL := $(shell cygpath -m /bin/sh) else SHELL := /bin/sh endif +else +SHELL := /bin/sh +endif endif true := T diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk index 5d48dd3ad02a..2b11ca36acfb 100644 --- a/solenv/gbuild/platform/com_MSC_class.mk +++ b/solenv/gbuild/platform/com_MSC_class.mk @@ -364,8 +364,11 @@ endef # CppunitTest class gb_CppunitTest_DEFS := -D_DLL +ifeq ($(GNUMAKE_WIN_NATIVE),TRUE) gb_CppunitTest_CPPTESTPRECOMMAND := $(call gb_Helper_prepend_ld_path,$(shell cygpath -w $(gb_Library_DLLDIR));$(shell cygpath -w $(WORKDIR)/UnpackedTarball/cppunit/src/cppunit/$(if $(MSVC_USE_DEBUG_RUNTIME),DebugDll,ReleaseDll))) - +else +gb_CppunitTest_CPPTESTPRECOMMAND := $(call gb_Helper_prepend_ld_path,$(shell cygpath -u $(gb_Library_DLLDIR)):$(shell cygpath -u $(WORKDIR)/UnpackedTarball/cppunit/src/cppunit/$(if $(MSVC_USE_DEBUG_RUNTIME),DebugDll,ReleaseDll))) +endif gb_CppunitTest_get_filename = test_$(1).dll gb_CppunitTest_get_ilibfilename = itest_$(1).lib diff --git a/solenv/gbuild/platform/com_MSC_defs.mk b/solenv/gbuild/platform/com_MSC_defs.mk index b442bac68a15..f5dc49605802 100644 --- a/solenv/gbuild/platform/com_MSC_defs.mk +++ b/solenv/gbuild/platform/com_MSC_defs.mk @@ -294,10 +294,20 @@ gb_LTOFLAGS := $(if $(filter TRUE,$(ENABLE_LTO)),-GL) # Helper class +ifeq ($(GNUMAKE_WIN_NATIVE),TRUE) gb_Helper_set_ld_path := PATH="$$PATH;$(shell cygpath -w $(INSTDIR)/$(LIBO_URE_LIB_FOLDER));$(shell cygpath -w $(INSTDIR)/$(LIBO_BIN_FOLDER))" define gb_Helper_prepend_ld_path PATH="$(shell cygpath -w $(INSTDIR)/$(LIBO_URE_LIB_FOLDER));$(shell cygpath -w $(INSTDIR)/$(LIBO_BIN_FOLDER));$(1);$$PATH" endef +else +gb_Helper_set_ld_path := PATH="$$PATH:$(shell cygpath -u $(INSTDIR)/$(LIBO_URE_LIB_FOLDER)):$(shell cygpath -u $(INSTDIR)/$(LIBO_BIN_FOLDER))" + +define gb_Helper_prepend_ld_path +PATH="$(shell cygpath -u $(INSTDIR)/$(LIBO_URE_LIB_FOLDER)):$(shell cygpath -u $(INSTDIR)/$(LIBO_BIN_FOLDER)):$(1):$$PATH" +endef + +endif + # vim: set noet sw=4: |