diff options
| author | Patrik Nyblom <[email protected]> | 2011-10-25 12:31:54 +0200 |
|---|---|---|
| committer | Patrik Nyblom <[email protected]> | 2011-12-02 15:21:10 +0100 |
| commit | e78a1582dc13d770bf1a9de64ff817369c741ef5 (patch) | |
| tree | e2aa3f037e3c3a9c8c72080f5d8c4c0e4f0c4c8b /lib | |
| parent | e1d960cb615a86faae67c16dc2d185b367f1c385 (diff) | |
| download | otp-e78a1582dc13d770bf1a9de64ff817369c741ef5.tar.gz otp-e78a1582dc13d770bf1a9de64ff817369c741ef5.tar.bz2 otp-e78a1582dc13d770bf1a9de64ff817369c741ef5.zip | |
Make Win64 build work both under MSYS and Cygwin
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/erl_interface/aclocal.m4 | 2 | ||||
| -rw-r--r-- | lib/odbc/aclocal.m4 | 2 | ||||
| -rw-r--r-- | lib/wx/aclocal.m4 | 2 | ||||
| -rwxr-xr-x | lib/wx/configure.in | 9 |
4 files changed, 12 insertions, 3 deletions
diff --git a/lib/erl_interface/aclocal.m4 b/lib/erl_interface/aclocal.m4 index 34237fcb43..339a15a2bb 100644 --- a/lib/erl_interface/aclocal.m4 +++ b/lib/erl_interface/aclocal.m4 @@ -132,7 +132,7 @@ if test "X$host" = "Xwin32" -a "x$GCC" != "xyes"; then AC_MSG_RESULT([Cygwin and VC]) MIXED_CYGWIN_VC=yes CPPFLAGS="$CPPFLAGS -DERTS_MIXED_CYGWIN_VC" - elif test -x /usr/bin/i686-pc-msys-gcc.exe; then + elif test -x /usr/bin/msysinfo; then CFLAGS="-O2" MIXED_MSYS=yes AC_MSG_RESULT([MSYS and VC]) diff --git a/lib/odbc/aclocal.m4 b/lib/odbc/aclocal.m4 index 34237fcb43..339a15a2bb 100644 --- a/lib/odbc/aclocal.m4 +++ b/lib/odbc/aclocal.m4 @@ -132,7 +132,7 @@ if test "X$host" = "Xwin32" -a "x$GCC" != "xyes"; then AC_MSG_RESULT([Cygwin and VC]) MIXED_CYGWIN_VC=yes CPPFLAGS="$CPPFLAGS -DERTS_MIXED_CYGWIN_VC" - elif test -x /usr/bin/i686-pc-msys-gcc.exe; then + elif test -x /usr/bin/msysinfo; then CFLAGS="-O2" MIXED_MSYS=yes AC_MSG_RESULT([MSYS and VC]) diff --git a/lib/wx/aclocal.m4 b/lib/wx/aclocal.m4 index 34237fcb43..339a15a2bb 100644 --- a/lib/wx/aclocal.m4 +++ b/lib/wx/aclocal.m4 @@ -132,7 +132,7 @@ if test "X$host" = "Xwin32" -a "x$GCC" != "xyes"; then AC_MSG_RESULT([Cygwin and VC]) MIXED_CYGWIN_VC=yes CPPFLAGS="$CPPFLAGS -DERTS_MIXED_CYGWIN_VC" - elif test -x /usr/bin/i686-pc-msys-gcc.exe; then + elif test -x /usr/bin/msysinfo; then CFLAGS="-O2" MIXED_MSYS=yes AC_MSG_RESULT([MSYS and VC]) diff --git a/lib/wx/configure.in b/lib/wx/configure.in index a2e41b540e..e00d5cba98 100755 --- a/lib/wx/configure.in +++ b/lib/wx/configure.in @@ -398,6 +398,15 @@ else CWXWIN3=$CWXWIN_PROG/wxWidgets-2.8 CWXWIN4=$CWXWIN_PROG/wxMSW-2.8 CWX_DOCUMENTED="/opt/local/pgm/wxMSW-2.8.* /opt/local/pgm/wxWidgets-2.8.*" + case $ac_cv_sizeof_void_p in + 8) + CWX_DOCUMENTED="/opt/local64/pgm/wxMSW-2.8.* /opt/local64/pgm/wxWidgets-2.8.* $CWX_DOCUMENTED" + ;; + *) + true + ;; + esac + CWXPATH="$CWXWIN1 $CWXWIN2 $CWX_DOCUMENTED $CWXWIN3.* $CWXWIN4.*" for dir in $CWXPATH; do |