summaryrefslogtreecommitdiff
path: root/make/otp.mk.in
diff options
context:
space:
mode:
authorDan Gudmundsson <dgud@erlang.org>2019-09-09 17:16:36 +0200
committerDan Gudmundsson <dgud@erlang.org>2019-11-12 07:34:17 +0100
commita314e2768dd5c64950c48b24f32a0eec62ded385 (patch)
tree9c83b068c0e5f7bb1d8aa223b03562b7e223ee16 /make/otp.mk.in
parent5b8e5e0d27fcbebee51ae0e714cbe97630405904 (diff)
downloaderlang-a314e2768dd5c64950c48b24f32a0eec62ded385.tar.gz
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 <arch>.
Diffstat (limited to 'make/otp.mk.in')
-rw-r--r--make/otp.mk.in6
1 files changed, 1 insertions, 5 deletions
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@