summaryrefslogtreecommitdiff
path: root/solenv
diff options
context:
space:
mode:
authorChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2023-10-20 12:22:39 +0200
committerChristian Lohmaier <lohmaier+LibreOffice@googlemail.com>2023-10-20 15:45:41 +0200
commit99ac24b38743d323a52cf9c9c884c3b468635a55 (patch)
tree3683d13fd0827a67fb2e7783466cc680d1f0ac1d /solenv
parente106b8658068bd8c5d1ef2da1bf2dc1dc352a4ab (diff)
fix GBUILD_TRACE on cygwin, needs to have unix-style path for the log
make's abspath function turns the path into windows-style, but that fails for appending to the log/the rule needs a unix-style path Change-Id: Ibb4a32bee10f7c69e8f57c1a771efc85ace283e1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158238 Tested-by: Jenkins Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Diffstat (limited to 'solenv')
-rw-r--r--solenv/gbuild/Trace.mk4
1 files changed, 4 insertions, 0 deletions
diff --git a/solenv/gbuild/Trace.mk b/solenv/gbuild/Trace.mk
index 8fc8336f7cdb..a92f842e1dec 100644
--- a/solenv/gbuild/Trace.mk
+++ b/solenv/gbuild/Trace.mk
@@ -25,6 +25,10 @@
gb_TRACE :=
ifneq ($(GBUILD_TRACE),)
gb_TRACE := $(abspath $(GBUILD_TRACE))
+ifeq ($(OS),WNT)
+# abspath turns it into a windows-style path, but the build needs unix-style
+gb_TRACE := $(shell cygpath -u $(gb_TRACE))
+endif
endif
ifneq ($(gb_TRACE),)