diff options
| author | Dan Gudmundsson <[email protected]> | 2014-01-21 16:01:33 +0100 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2014-01-21 16:01:33 +0100 |
| commit | f836096cb383c6a3c5c91956ded5bd4e2772bcd2 (patch) | |
| tree | 293fd589d9bab7505ef7d4a6cb2dbb82c69b01e7 /lib/wx/configure.in | |
| parent | df47401bc897afc1b3929fc32426fcb0d0c00d0a (diff) | |
| parent | 31172443bfc849b879385d7ee0d2ea8019c32307 (diff) | |
| download | otp-f836096cb383c6a3c5c91956ded5bd4e2772bcd2.tar.gz otp-f836096cb383c6a3c5c91956ded5bd4e2772bcd2.tar.bz2 otp-f836096cb383c6a3c5c91956ded5bd4e2772bcd2.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/wx/configure.in')
| -rwxr-xr-x | lib/wx/configure.in | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/lib/wx/configure.in b/lib/wx/configure.in index 12b4de6fe6..3756786831 100755 --- a/lib/wx/configure.in +++ b/lib/wx/configure.in @@ -183,7 +183,7 @@ AC_SUBST(OBJC_CFLAGS) case $host_os in darwin*) - LDFLAGS="-bundle -flat_namespace -undefined warning -fPIC $LDFLAGS" + LDFLAGS="$MAC_MIN -bundle -flat_namespace -undefined warning -fPIC $LDFLAGS" # Check sizof_void_p as future will hold 64bit MacOS wx if test $ac_cv_sizeof_void_p = 4; then LDFLAGS="-m32 $LDFLAGS" @@ -211,20 +211,20 @@ dnl ---------------------------------------------------------------------- case $host_os in mingw32) DEBUG_CFLAGS="-g -Wall -DDEBUG $CFLAGS" - CFLAGS="-g -Wall -O2 -fomit-frame-pointer -fno-strict-aliasing $CFLAGS" + CFLAGS="-g -Wall -O2 $CFLAGS -fomit-frame-pointer -fno-strict-aliasing" ;; win32) - DEBUG_CFLAGS="-g -Wall -DDEBUG $CFLAGS" + DEBUG_CFLAGS="-g -Wall $CFLAGS -DDEBUG" CFLAGS="-g -Wall -O2 $CFLAGS" ;; darwin*) - DEBUG_CFLAGS="-g -Wall -fPIC -DDEBUG $CFLAGS" - # Disable -02 crashes with xcode 5.0.2 (clang-500.2.79) - CFLAGS="-g -Wall -fPIC -fomit-frame-pointer -fno-strict-aliasing $CFLAGS" + DEBUG_CFLAGS="-g -Wall -fPIC $CFLAGS -DDEBUG" + # omit-frame-pointer causes seg faults with 10.9 and clang + CFLAGS="-g -Wall -fPIC $CFLAGS -fno-strict-aliasing" ;; *) - DEBUG_CFLAGS="-g -Wall -fPIC -DDEBUG $CFLAGS" - CFLAGS="-g -Wall -O2 -fPIC -fomit-frame-pointer -fno-strict-aliasing $CFLAGS" + DEBUG_CFLAGS="-g -Wall -fPIC $CFLAGS -DDEBUG" + CFLAGS="-g -Wall -O2 -fPIC $CFLAGS -fomit-frame-pointer -fno-strict-aliasing" ;; esac |