diff options
| author | Loïc Hoguin <[email protected]> | 2017-11-18 21:02:15 +0100 |
|---|---|---|
| committer | Loïc Hoguin <[email protected]> | 2017-11-18 21:02:15 +0100 |
| commit | 378d31dc1d7d7fe3e171cd75be6820ecc073d448 (patch) | |
| tree | e93463f0a8b6afebc936b38b7e2f1b0c75130902 /early-plugins.mk | |
| parent | a5a7e13e966c5943a706f71523fe77ce2f86aca0 (diff) | |
| download | ci.erlang.mk-378d31dc1d7d7fe3e171cd75be6820ecc073d448.tar.gz ci.erlang.mk-378d31dc1d7d7fe3e171cd75be6820ecc073d448.tar.bz2 ci.erlang.mk-378d31dc1d7d7fe3e171cd75be6820ecc073d448.zip | |
Fix msys2 paths
Diffstat (limited to 'early-plugins.mk')
| -rw-r--r-- | early-plugins.mk | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/early-plugins.mk b/early-plugins.mk index c20ed55..ef8ee3a 100644 --- a/early-plugins.mk +++ b/early-plugins.mk @@ -78,18 +78,20 @@ WINDOWS-OTP-18+ := $(WINDOWS-OTP-18) $(WINDOWS-OTP-19) $(WINDOWS-OTP-20) WINDOWS-OTP-19+ := $(WINDOWS-OTP-19) $(WINDOWS-OTP-20) WINDOWS-OTP-20+ := $(WINDOWS-OTP-20) -WINDOWS-OTP-18.0-INSTALL-DIR := $(call core_native_path,$(PROGRAMFILES)/erl7.0/bin) -WINDOWS-OTP-18.1-INSTALL-DIR := $(call core_native_path,$(PROGRAMFILES)/erl7.1/bin) -WINDOWS-OTP-18.2.1-INSTALL-DIR := $(call core_native_path,$(PROGRAMFILES)/erl7.2.1/bin) -WINDOWS-OTP-18.3-INSTALL-DIR := $(call core_native_path,$(PROGRAMFILES)/erl7.3/bin) - -WINDOWS-OTP-19.0-INSTALL-DIR := $(call core_native_path,$(PROGRAMFILES)/erl8.0/bin) -WINDOWS-OTP-19.1-INSTALL-DIR := $(call core_native_path,$(PROGRAMFILES)/erl8.1/bin) -WINDOWS-OTP-19.2-INSTALL-DIR := $(call core_native_path,$(PROGRAMFILES)/erl8.2/bin) -WINDOWS-OTP-19.3-INSTALL-DIR := $(call core_native_path,$(PROGRAMFILES)/erl8.3/bin) - -WINDOWS-OTP-20.0-INSTALL-DIR := $(call core_native_path,$(PROGRAMFILES)/erl9.0/bin) -WINDOWS-OTP-20.1-INSTALL-DIR := $(call core_native_path,$(PROGRAMFILES)/erl9.1/bin) +msys2_path = $(shell cygpath -u $1) + +WINDOWS-OTP-18.0-INSTALL-DIR := $(call msys2_path,$(PROGRAMFILES)/erl7.0/bin) +WINDOWS-OTP-18.1-INSTALL-DIR := $(call msys2_path,$(PROGRAMFILES)/erl7.1/bin) +WINDOWS-OTP-18.2.1-INSTALL-DIR := $(call msys2_path,$(PROGRAMFILES)/erl7.2.1/bin) +WINDOWS-OTP-18.3-INSTALL-DIR := $(call msys2_path,$(PROGRAMFILES)/erl7.3/bin) + +WINDOWS-OTP-19.0-INSTALL-DIR := $(call msys2_path,$(PROGRAMFILES)/erl8.0/bin) +WINDOWS-OTP-19.1-INSTALL-DIR := $(call msys2_path,$(PROGRAMFILES)/erl8.1/bin) +WINDOWS-OTP-19.2-INSTALL-DIR := $(call msys2_path,$(PROGRAMFILES)/erl8.2/bin) +WINDOWS-OTP-19.3-INSTALL-DIR := $(call msys2_path,$(PROGRAMFILES)/erl8.3/bin) + +WINDOWS-OTP-20.0-INSTALL-DIR := $(call msys2_path,$(PROGRAMFILES)/erl9.0/bin) +WINDOWS-OTP-20.1-INSTALL-DIR := $(call msys2_path,$(PROGRAMFILES)/erl9.1/bin) define ci_windows_target ci-windows-$1: $(WINDOWS-OTP-$1-INSTALL-DIR) |