diff options
| author | Thorsten Behrens <thorsten.behrens@allotropia.de> | 2021-08-03 18:32:16 +0200 |
|---|---|---|
| committer | Thorsten Behrens <thorsten.behrens@allotropia.de> | 2021-08-04 11:08:29 +0200 |
| commit | da36d655608c3da39fd79d95974e1f7404a27aa0 (patch) | |
| tree | e4e61710bd230248f82f2b7c2828856d20d7b17d | |
| parent | 330ba10a212f007babb2f3d27de88197936291dd (diff) | |
Always provision PATH the cygwin way under Windows
With PATH essentially serving the role of LD_LIBRARY_PATH under
Windows, there was the notion that this needs to be provided in
Windows notation, for win32 gnumake.
That was perhaps once true; currently we're always evaluating PATH
inside a shell, not the Makefile. So this since a while only worked
accidentally, due to cygwin transparently converting between DOS and
UNIX PATH vars. It did break though for corner-cases, e.g.
SRCDIR!=BUILDDIR, and BUILDDIR e.g. D:\FOO.
With that simplification, also GNUMAKE_WIN_NATIVE can go.
Change-Id: Ied5a0443dc70e7dc629c0c0620e6ce911d9a73d0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119941
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>
| -rw-r--r-- | config_host.mk.in | 1 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | solenv/gbuild/platform/com_MSC_class.mk | 4 | ||||
| -rw-r--r-- | solenv/gbuild/platform/com_MSC_defs.mk | 12 |
4 files changed, 3 insertions, 15 deletions
diff --git a/config_host.mk.in b/config_host.mk.in index d74fecae9522..58ca1d1c14fb 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -243,7 +243,6 @@ export GNUTLS_CFLAGS=$(gb_SPACE)@GNUTLS_CFLAGS@ export GNUTLS_LIBS=$(gb_SPACE)@GNUTLS_LIBS@ export PARALLELISM?=@PARALLELISM@ @x_GNUCP@ export GNUCOPY=@GNUCP@ -export GNUMAKE_WIN_NATIVE=@GNUMAKE_WIN_NATIVE@ export GNUPATCH=@GNUPATCH@ export GNUTAR=@GNUTAR@ export GOBJECT_CFLAGS=$(gb_SPACE)@GOBJECT_CFLAGS@ diff --git a/configure.ac b/configure.ac index 675a6a1e8395..3d2bf7e24555 100644 --- a/configure.ac +++ b/configure.ac @@ -6095,7 +6095,6 @@ else fi rm -rf $TESTGMAKEFILEFUNC AC_SUBST(HAVE_GNUMAKE_FILE_FUNC) -AC_SUBST(GNUMAKE_WIN_NATIVE) _make_ver_check=`$GNUMAKE --version | grep "Built for Windows"` STALE_MAKE= diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk index 76dea12e1ec6..0d35b7915999 100644 --- a/solenv/gbuild/platform/com_MSC_class.mk +++ b/solenv/gbuild/platform/com_MSC_class.mk @@ -470,11 +470,7 @@ endef gb_CppunitTest_UNITTESTFAILED := $(GBUILDDIR)/platform/unittest-failed-WNT.sh gb_CppunitTest_PYTHONDEPS := $(call gb_Package_get_target,python3) 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 1fa6d87bdd29..07720dc2e2f1 100644 --- a/solenv/gbuild/platform/com_MSC_defs.mk +++ b/solenv/gbuild/platform/com_MSC_defs.mk @@ -297,21 +297,15 @@ endif # Helper class -ifeq ($(GNUMAKE_WIN_NATIVE),TRUE) -gb_MAKE_CYGPATH := -w -else -gb_MAKE_CYGPATH := -u -endif - -gb_Helper_set_ld_path := PATH="$(shell cygpath $(gb_MAKE_CYGPATH) $(INSTDIR_FOR_BUILD)/$(LIBO_URE_LIB_FOLDER));$(shell cygpath $(gb_MAKE_CYGPATH) $(INSTDIR_FOR_BUILD)/$(LIBO_BIN_FOLDER));$$PATH" +gb_Helper_set_ld_path := PATH="$(shell cygpath -u $(INSTDIR_FOR_BUILD)/$(LIBO_URE_LIB_FOLDER)):$(shell cygpath -u $(INSTDIR_FOR_BUILD)/$(LIBO_BIN_FOLDER)):$$PATH" define gb_Helper_prepend_ld_path -PATH="$(shell cygpath $(gb_MAKE_CYGPATH) $(INSTDIR_FOR_BUILD)/$(LIBO_URE_LIB_FOLDER));$(shell cygpath $(gb_MAKE_CYGPATH) $(INSTDIR_FOR_BUILD)/$(LIBO_BIN_FOLDER));$(1);$$PATH" +PATH="$(shell cygpath -u $(INSTDIR_FOR_BUILD)/$(LIBO_URE_LIB_FOLDER)):$(shell cygpath -u $(INSTDIR_FOR_BUILD)/$(LIBO_BIN_FOLDER)):$(1):$$PATH" endef # $(1): one directory pathname to append to the ld path define gb_Helper_extend_ld_path -$(gb_Helper_set_ld_path)';$(shell cygpath $(gb_MAKE_CYGPATH) $(1))' +$(gb_Helper_set_ld_path)':$(shell cygpath -u $(1))' endef # common macros to build GPG related libraries |