diff options
| author | Björn Gustavsson <[email protected]> | 2011-11-30 10:44:42 +0100 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2011-11-30 10:44:42 +0100 |
| commit | f7c881208154dcae6d0b753a160eb771710bd47a (patch) | |
| tree | 14f19e6524a33f5e2d664e162ecf0d3b21d0d959 /lib | |
| parent | 8e5ef86ee21cb6491287710606a7525f45cc50fc (diff) | |
| parent | 3c36d2c5f75827f098a691dfcf534ab3b95d7bd9 (diff) | |
| download | otp-f7c881208154dcae6d0b753a160eb771710bd47a.tar.gz otp-f7c881208154dcae6d0b753a160eb771710bd47a.tar.bz2 otp-f7c881208154dcae6d0b753a160eb771710bd47a.zip | |
Merge branch 'bjorn/llvm-issues/OTP-9712'
* bjorn/llvm-issues/OTP-9712:
INSTALL.md: Update build instructions for Lion
Fix clang linking problem
configure: Define NO_JUMP_TABLE if all we have is llvm-gcc
beam_emu.c: Eliminate warnings when NO_JUMP_TABLE is defined
beam_emu.c: Use the correct void* type for computed gotos
MacOS X: Completely remove obsolete -no-cpp-precomp option
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/erl_interface/configure.in | 6 | ||||
| -rw-r--r-- | lib/megaco/configure.in | 2 | ||||
| -rwxr-xr-x | lib/wx/configure.in | 13 |
3 files changed, 1 insertions, 20 deletions
diff --git a/lib/erl_interface/configure.in b/lib/erl_interface/configure.in index 72ac8c7bbf..abe1602be1 100644 --- a/lib/erl_interface/configure.in +++ b/lib/erl_interface/configure.in @@ -338,12 +338,6 @@ AC_SUBST(LIB_CFLAGS) if test "X$host" = "Xwin32"; then LIB_CFLAGS="$CFLAGS" else - case $host_os in - darwin*) - CFLAGS="$CFLAGS -no-cpp-precomp" - ;; - esac - if test "x$GCC" = xyes; then LIB_CFLAGS="$CFLAGS -fPIC" else diff --git a/lib/megaco/configure.in b/lib/megaco/configure.in index b88e17ec85..42c50b8961 100644 --- a/lib/megaco/configure.in +++ b/lib/megaco/configure.in @@ -208,7 +208,7 @@ if test "X$host" = "Xwin32"; then else case $host_os in darwin*) - CFLAGS="$CFLAGS -no-cpp-precomp -fno-common" + CFLAGS="$CFLAGS -fno-common" ;; esac diff --git a/lib/wx/configure.in b/lib/wx/configure.in index 78c3f0d3d2..e5dc83b27e 100755 --- a/lib/wx/configure.in +++ b/lib/wx/configure.in @@ -219,19 +219,6 @@ AC_SUBST(OBJC_CFLAGS) case $host_os in darwin*) - AC_TRY_COMPILE([],[ - #if __GNUC__ >= 4 - ; - #else - #error old or no gcc - #endif - ], - gcc_need_no_cpp_precomp=no, - gcc_need_no_cpp_precomp=yes) - - if test x$gcc_need_no_cpp_precomp = xyes; then - CFLAGS="-no-cpp-precomp $CFLAGS" - fi LDFLAGS="-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 |