diff options
author | Patrik Nyblom <[email protected]> | 2011-06-08 10:00:48 +0200 |
---|---|---|
committer | Patrik Nyblom <[email protected]> | 2011-12-02 15:21:10 +0100 |
commit | f2fce18b897189a60c518017704bf3b100451a93 (patch) | |
tree | 17e77a595f8f0f5c1f20813985b8a346b22abeee /otp_build | |
parent | 7f9e276476c4939cf3c79f6786abf0b714cee333 (diff) | |
download | otp-f2fce18b897189a60c518017704bf3b100451a93.tar.gz otp-f2fce18b897189a60c518017704bf3b100451a93.tar.bz2 otp-f2fce18b897189a60c518017704bf3b100451a93.zip |
Get cerl and distribution working in Win64
Can still not setup -a, but cerl works.
Diffstat (limited to 'otp_build')
-rwxr-xr-x | otp_build | 13 |
1 files changed, 10 insertions, 3 deletions
@@ -732,7 +732,9 @@ echo_env_win32 () fi done IFS=$save_ifs + WIN32_WRAPPER_PATH="$ERL_TOP/erts/etc/win32/cygwin_tools/vc:$ERL_TOP/erts/etc/win32/cygwin_tools" + echo_setenv OVERRIDE_TARGET win32 ';' echo_setenv CC cc.sh ';' echo_setenv CXX cc.sh ';' @@ -742,7 +744,8 @@ echo_env_win32 () echo_setenv OVERRIDE_CONFIG_CACHE_STATIC "$ERL_TOP/erts/autoconf/win32.config.cache.static" ';' fi echo_setenv OVERRIDE_CONFIG_CACHE "$ERL_TOP/erts/autoconf/win32.config.cache" ';' - echo_setenv PATH "$ERL_TOP/erts/etc/win32/cygwin_tools/vc:$ERL_TOP/erts/etc/win32/cygwin_tools:$P3" ';' + echo_setenv WIN32_WRAPPER_PATH "$WIN32_WRAPPER_PATH" ';' + echo_setenv PATH "$WIN32_WRAPPER_PATH:$P3" ';' echo_envinfo } @@ -804,6 +807,7 @@ echo_env_mingw32 () echo "needed for message file compilation: http://wine.sourceforge.net!!" >&2 return fi + WIN32_WRAPPER_PATH="$ERL_TOP/erts/etc/win32/cygwin_tools/mingw:$ERL_TOP/erts/etc/win32/cygwin_tools" echo_setenv OVERRIDE_TARGET win32 ';' @@ -813,7 +817,8 @@ echo_env_mingw32 () echo_setenv CXX cc.sh ';' echo_setenv AR ar.sh ';' echo_setenv RANLIB true ';' - echo_setenv PATH "$ERL_TOP/erts/etc/win32/cygwin_tools/mingw:$ERL_TOP/erts/etc/win32/cygwin_tools:$P3" + echo_setenv WIN32_WRAPPER_PATH "$WIN32_WRAPPER_PATH" ';' + echo_setenv PATH "$WIN32_WRAPPER_PATH:$P3" ';' echo_envinfo } @@ -861,6 +866,7 @@ echo_env_msys64 () fi done IFS=$save_ifs + WIN32_WRAPPER_PATH="$ERL_TOP/erts/etc/win32/msys_tools/vc:$ERL_TOP/erts/etc/win32/msys_tools" echo_setenv OVERRIDE_TARGET win32 ';' echo_setenv CONFIG_SUBTYPE win64 ';' @@ -869,7 +875,8 @@ echo_env_msys64 () echo_setenv AR ar.sh ';' echo_setenv RANLIB true ';' echo_setenv OVERRIDE_CONFIG_CACHE "$ERL_TOP/erts/autoconf/win64.config.cache" ';' - echo_setenv PATH "$ERL_TOP/erts/etc/win32/msys_tools/vc:$ERL_TOP/erts/etc/win32/msys_tools:$P3" ';' + echo_setenv WIN32_WRAPPER_PATH "$WIN32_WRAPPER_PATH" ';' + echo_setenv PATH "$WIN32_WRAPPER_PATH:$P3" ';' echo_envinfo } |