From a314e2768dd5c64950c48b24f32a0eec62ded385 Mon Sep 17 00:00:00 2001 From: Dan Gudmundsson Date: Mon, 9 Sep 2019 17:16:36 +0200 Subject: Refactor win32 configure handling There are a lot of MIXED_* options and adding a another mode for WSL will make things worse, thus a cleanup is done first. This commit consolidates the handling for the Makefiles, src and scripts and moves the funcionality into similar named wrapper-scripts instead. Path conversion is done with a script 'w32_path.sh' and registry lookups with 'reg_query.sh'. Path to the wrapper scripts is setup with: otp_build env_win32 . --- make/otp.mk.in | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'make/otp.mk.in') diff --git a/make/otp.mk.in b/make/otp.mk.in index cc76f00e7e..7c545a5e9c 100644 --- a/make/otp.mk.in +++ b/make/otp.mk.in @@ -90,12 +90,8 @@ AR = @AR@ PERL = @PERL@ LLVM_PROFDATA = @LLVM_PROFDATA@ -MIXED_CYGWIN_VC = @MIXED_CYGWIN_VC@ -MIXED_MSYS_VC = @MIXED_MSYS_VC@ MIXED_VC = @MIXED_VC@ -MIXED_CYGWIN_MINGW = @MIXED_CYGWIN_MINGW@ -MIXED_CYGWIN = @MIXED_CYGWIN@ -MIXED_MSYS = @MIXED_MSYS@ +MIXED_MINGW = @MIXED_MINGW@ BITS64 = @BITS64@ -- cgit v1.2.1