From e59be1b11960eb9b2a2fbb0b80b482508b704d3d Mon Sep 17 00:00:00 2001 From: Kai Tietz Date: Fri, 17 Jul 2009 09:21:25 +0000 Subject: [PATCH] configure.ac: Add rule for mingw targets to add -DGC_BUILD=1 to cflags. 2009-07-17 Kai Tietz * configure.ac: Add rule for mingw targets to add -DGC_BUILD=1 to cflags. * configure: Regenerated. From-SVN: r149737 --- boehm-gc/ChangeLog | 6 ++++++ boehm-gc/configure | 49 +++++++++++++++++++++++++------------------ boehm-gc/configure.ac | 7 +++++++ 3 files changed, 42 insertions(+), 20 deletions(-) diff --git a/boehm-gc/ChangeLog b/boehm-gc/ChangeLog index d2a80cc1fcb..14ba80a9a7a 100644 --- a/boehm-gc/ChangeLog +++ b/boehm-gc/ChangeLog @@ -1,3 +1,9 @@ +2009-07-17 Kai Tietz + + * configure.ac: Add rule for mingw targets to add -DGC_BUILD=1 to + cflags. + * configure: Regenerated. + 2009-05-17 Dave Korn * win32_threads.c (GC_get_thread_stack_base): Implement for Cygwin. diff --git a/boehm-gc/configure b/boehm-gc/configure index 6d2cf83e4cf..c3adff342fd 100755 --- a/boehm-gc/configure +++ b/boehm-gc/configure @@ -4194,6 +4194,12 @@ case "${host}" in ;; esac +case "${host}" in + *-*-mingw*) + gc_cflags="${gc_cflags} -DGC_BUILD=1" + ;; +esac + GC_CFLAGS=${gc_cflags} @@ -4619,13 +4625,13 @@ if test "${lt_cv_nm_interface+set}" = set; then else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:4622: $ac_compile\"" >&5) + (eval echo "\"\$as_me:4628: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:4625: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:4631: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:4628: output\"" >&5) + (eval echo "\"\$as_me:4634: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -5783,7 +5789,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 5786 "configure"' > conftest.$ac_ext + echo '#line 5792 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -8277,11 +8283,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8280: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8286: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8284: \$? = $ac_status" >&5 + echo "$as_me:8290: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -8616,11 +8622,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8619: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8625: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8623: \$? = $ac_status" >&5 + echo "$as_me:8629: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -8721,11 +8727,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8724: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8730: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8728: \$? = $ac_status" >&5 + echo "$as_me:8734: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -8776,11 +8782,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8779: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8785: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8783: \$? = $ac_status" >&5 + echo "$as_me:8789: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -11643,7 +11649,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11646 "configure" +#line 11652 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11739,7 +11745,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11742 "configure" +#line 11748 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -13765,11 +13771,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13768: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13774: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13772: \$? = $ac_status" >&5 + echo "$as_me:13778: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -13864,11 +13870,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13867: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13873: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13871: \$? = $ac_status" >&5 + echo "$as_me:13877: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -13916,11 +13922,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13919: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13925: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13923: \$? = $ac_status" >&5 + echo "$as_me:13929: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -17407,6 +17413,9 @@ ac_configure_args="${multilib_arg} ${ac_configure_args}" multi_basedir="$multi_basedir" CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} CC="$CC" +CXX="$CXX" +GFORTRAN="$GFORTRAN" +GCJ="$GCJ" AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" diff --git a/boehm-gc/configure.ac b/boehm-gc/configure.ac index 326a051f767..2206f76eaa2 100644 --- a/boehm-gc/configure.ac +++ b/boehm-gc/configure.ac @@ -84,6 +84,13 @@ case "${host}" in ;; esac +dnl Add for mingw targets GC_BUILD option +case "${host}" in + *-*-mingw*) + gc_cflags="${gc_cflags} -DGC_BUILD=1" + ;; +esac + dnl gc_cflags="${gc_cflags} -fno-builtin" GC_CFLAGS=${gc_cflags}