diff options
| author | Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> | 2011-04-15 09:26:05 +0000 |
|---|---|---|
| committer | Rainer Orth <ro@gcc.gnu.org> | 2011-04-15 09:26:05 +0000 |
| commit | b98b952feb6aea1e33371d0b64a9622603ac146e (patch) | |
| tree | 44707a82d0a5720e8027d1d267f90e083dc9834c /libobjc/configure | |
| parent | ad19c4be9ab0c334aa539e3785380108a7bf5953 (diff) | |
| download | gcc-b98b952feb6aea1e33371d0b64a9622603ac146e.zip gcc-b98b952feb6aea1e33371d0b64a9622603ac146e.tar.gz gcc-b98b952feb6aea1e33371d0b64a9622603ac146e.tar.bz2 | |
re PR libobjc/32037 (--enable-objc-gc on OS X won't build)
PR libobjc/32037
* Makefile.in (OBJC_GCFLAGS): Move ...
* configure.ac (enable_objc_gc): ... here.
Add $(libsuffix) to OBJC_BOEHM_GC.
* configure: Regenerate.
From-SVN: r172477
Diffstat (limited to 'libobjc/configure')
| -rwxr-xr-x | libobjc/configure | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/libobjc/configure b/libobjc/configure index 8f670e1..9c3f621 100755 --- a/libobjc/configure +++ b/libobjc/configure @@ -656,6 +656,7 @@ host multi_basedir OBJC_BOEHM_GC_INCLUDES OBJC_BOEHM_GC +OBJC_GCFLAGS VERSION target_subdir host_subdir @@ -2320,21 +2321,31 @@ $as_echo "$version_specific_libs" >&6; } if test "${enable_objc_gc+set}" = set; then : enableval=$enable_objc_gc; case $enable_objc_gc in no) + OBJC_GCFLAGS='' OBJC_BOEHM_GC='' OBJC_BOEHM_GC_INCLUDES='' ;; *) - OBJC_BOEHM_GC=libobjc_gc.la + OBJC_GCFLAGS='-DOBJC_WITH_GC=1' + OBJC_BOEHM_GC='libobjc_gc$(libsuffix).la' OBJC_BOEHM_GC_INCLUDES='-I$(top_srcdir)/../boehm-gc/include -I../boehm-gc/include' + case "${host}" in + alpha*-dec-osf*) + # boehm-gc headers include <pthread.h>, which needs to be compiled + # with -pthread on Tru64 UNIX. + OBJC_GCFLAGS="${OBJC_GCFLAGS} -pthread" + ;; + esac ;; esac else - OBJC_BOEHM_GC=''; OBJC_BOEHM_GC_INCLUDES='' + OBJC_GCFLAGS=''; OBJC_BOEHM_GC=''; OBJC_BOEHM_GC_INCLUDES='' fi + # ----------- # Directories # ----------- @@ -10583,7 +10594,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10586 "configure" +#line 10597 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10689,7 +10700,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10692 "configure" +#line 10703 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11472,7 +11483,7 @@ if test "${enable_sjlj_exceptions+set}" = set; then : enableval=$enable_sjlj_exceptions; : else cat > conftest.$ac_ext << EOF -#line 11475 "configure" +#line 11486 "configure" @interface Frob @end @implementation Frob |