diff options
Diffstat (limited to 'external')
| -rw-r--r-- | external/liblangtag/ExternalProject_langtag.mk | 4 | ||||
| -rw-r--r-- | external/openssl/ExternalProject_openssl.mk | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/external/liblangtag/ExternalProject_langtag.mk b/external/liblangtag/ExternalProject_langtag.mk index c3d411509cc3..8835bdf001b2 100644 --- a/external/liblangtag/ExternalProject_langtag.mk +++ b/external/liblangtag/ExternalProject_langtag.mk @@ -31,7 +31,9 @@ $(call gb_ExternalProject_get_state_target,langtag,build): $(if $(filter-out LINUX FREEBSD,$(OS)),,LDFLAGS="-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-rpath,\\"\$$\$$ORIGIN:'\'\$$\$$ORIGIN/../ure-link/lib) \ $(if $(filter-out SOLARIS,$(OS)),,LDFLAGS="-Wl$(COMMA)-z$(COMMA)origin -Wl$(COMMA)-R$(COMMA)\\"\$$\$$ORIGIN:'\'\$$\$$ORIGIN/../ure-link/lib) \ $(if $(filter-out WNTGCC,$(OS)$(COM)),,LDFLAGS="-Wl$(COMMA)--enable-runtime-pseudo-reloc-v2") \ - && $(if $(filter WNTMSC,$(OS)$(COM)),REAL_CC="$(shell cygpath -w $(lastword $(CC)))") \ + && $(if $(filter WNTMSC,$(OS)$(COM)),\ + REAL_CC="$(shell cygpath -w $(lastword $(filter-out -%,$(CC))))" \ + REAL_CC_FLAGS="$(filter -%,$(CC))") \ $(if $(VERBOSE)$(verbose),V=1) \ $(gb_Helper_set_ld_path) \ $(MAKE) \ diff --git a/external/openssl/ExternalProject_openssl.mk b/external/openssl/ExternalProject_openssl.mk index 12c757610ca5..ea5f8b22b1c8 100644 --- a/external/openssl/ExternalProject_openssl.mk +++ b/external/openssl/ExternalProject_openssl.mk @@ -61,7 +61,7 @@ OPENSSL_PLATFORM := \ ifeq ($(COM),MSC) $(call gb_ExternalProject_get_state_target,openssl,build): $(call gb_ExternalProject_run,build,\ - export CC="$(shell cygpath -w $(CC))" \ + export CC="$(shell cygpath -w $(filter-out -%,$(CC))) $(filter -%,$(CC))" \ && export PERL="$(shell cygpath -w $(PERL))" \ && export LIB="$(ILIB)" \ && $(PERL) Configure $(OPENSSL_PLATFORM) no-idea \ |