From f6fcc5b79ca72e0145b1798bbfa3d686bdf07042 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Thu, 29 Aug 2013 20:22:55 +0300 Subject: [PATCH] Set PATH for running the Cygwin Make Our normal gb_Helper_set_path sets PATH in Windows syntax, which is fine when running out own build-time tools (which obviously are not Cygwin programs), but not when running the Cygwin Make. Change-Id: I5563e2f5a01beb05db56792dfd56116832d2ec36 --- firebird/ExternalProject_firebird.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/firebird/ExternalProject_firebird.mk b/firebird/ExternalProject_firebird.mk index 296848efd62c..bf6b45368ba7 100644 --- a/firebird/ExternalProject_firebird.mk +++ b/firebird/ExternalProject_firebird.mk @@ -46,7 +46,10 @@ $(call gb_ExternalProject_get_state_target,firebird,build): --with-system-icu --without-fbsample --without-fbsample-db \ $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ $(if $(filter IOS ANDROID,$(OS)),--disable-shared,--disable-static) \ - && $(gb_Helper_set_ld_path) $(MAKE) firebird_embedded \ + && $(if $(filter WNT,$(OS)),\ + PATH="$(shell cygpath -u $(OUTDIR)/bin):$$PATH",\ + $(gb_Helper_set_ld_path)) \ + $(MAKE) firebird_embedded \ $(if $(filter MACOSX,$(OS)),&& $(PERL) \ $(SOLARENV)/bin/macosx-change-install-names.pl shl OOO \ $(gb_Package_SOURCEDIR_firebird)/gen/firebird/lib/libfbembed.dylib.2.5.2) \