diff mbox

boehm-gc removal and libobjc changes to build with an external bdw-gc

Message ID b7c26a24-40f0-c3dd-0471-f17c318ef7ef@ubuntu.com
State New
Headers show

Commit Message

Matthias Klose Nov. 30, 2016, 12:08 p.m. UTC 
On 30.11.2016 12:38, Richard Biener wrote:
> On Wed, Nov 30, 2016 at 12:30 PM, Matthias Klose <doko@ubuntu.com> wrote:


>> There's one more fix needed for the case of only having the pkg-config module

>> installed when configuring with --enable-objc-gc. We can't use PKG_CHECK_MODULES

>> directly because the pkg.m4 macros choke on the dash in the module name. Thus

>> setting the CFLAGS and LIBS directly. Ok to install?

> 

> Why not fix pkg.m4?


as discussed on irc, now avoiding the use pkg-config, and assuming that libgc is
available in default locations when no --with-target-bdw-gc flags are given.
Checked with --enable-objc-gc and --enabled-objc-gc=auto.  Ok to install?

Matthias
diff mbox

Patch

<toplevel>

	* configure.ac: Don't use pkg-config to check for bdw-gc.

config/

	* pkg.m4: Remove.

libobjc/

	* configure.ac: Don't use pkg-config to check for bdw-gc.

gcc/

	* doc/install.texi: Don't use pkg-config to check for bdw-gc.

Index: configure.ac
===================================================================
--- configure.ac	(Revision 243006)
+++ configure.ac	(Arbeitskopie)
@@ -29,7 +29,6 @@ 
 m4_include([ltversion.m4])
 m4_include([lt~obsolete.m4])
 m4_include([config/isl.m4])
-m4_include([config/pkg.m4])
 
 AC_INIT(move-if-change)
 AC_PREREQ(2.64)
@@ -2076,10 +2075,8 @@ 
 case ,${enable_languages},:${enable_objc_gc} in *,objc,*:yes|*,objc,*:auto)
   AC_MSG_CHECKING([for bdw garbage collector])
   if test "x$with_target_bdw_gc$with_target_bdw_gc_include$with_target_bdw_gc_lib" = x; then
-    dnl no bdw-gw options, fall back to the bdw-gc pkg-config module
-    PKG_CHECK_EXISTS(bdw-gc,
-      AC_MSG_RESULT([using bdw-gc pkg-config module]),
-      AC_MSG_ERROR([no --with-target-bdw-gc options and no bdw-gc pkg-config module found]))
+    dnl no bdw-gw options, assume default locations
+    AC_MSG_RESULT([using bdw-gc in default locations])
   else
     dnl bdw-gw options, first error checking, complete checking in libobjc
     if test "x$with_target_bdw_gc_include" = x && test "x$with_target_bdw_gc_lib" != x; then
Index: gcc/doc/install.texi
===================================================================
--- gcc/doc/install.texi	(Revision 243006)
+++ gcc/doc/install.texi	(Arbeitskopie)
@@ -2204,8 +2204,7 @@ 
 @option{--with-target-bdw-gc-lib} must always be specified together
 for each multilib variant and they take precedence over
 @option{--with-target-bdw-gc}.  If none of these options are
-specified, the values are taken from the @command{pkg-config}
-@samp{bdw-gc} module.
+specified, the library is assumed in default locations.
 @end table
 
 @html
Index: libobjc/configure.ac
===================================================================
--- libobjc/configure.ac	(Revision 243006)
+++ libobjc/configure.ac	(Arbeitskopie)
@@ -18,8 +18,6 @@ 
 #along with GCC; see the file COPYING3.  If not see
 #<http://www.gnu.org/licenses/>.
 
-m4_include([../config/pkg.m4])
-
 AC_PREREQ(2.64)
 AC_INIT(package-unused, version-unused,, libobjc)
 AC_CONFIG_SRCDIR([objc/objc.h])
@@ -223,10 +221,9 @@ 
 *)
   AC_MSG_CHECKING([for bdw garbage collector])
   if test "x$with_target_bdw_gc$with_target_bdw_gc_include$with_target_bdw_gc_lib" = x; then
-    dnl no bdw-gw options, fall back to the bdw-gc pkg-config module
-    PKG_CHECK_EXISTS(bdw-gc,
-      AC_MSG_RESULT([using bdw-gc pkg-config module]),
-      AC_MSG_ERROR([no --with-target-bdw-gc options and no bdw-gc pkg-config module found]))
+    dnl no bdw-gw options, assuming bdw-gc in default locations
+    BDW_GC_CFLAGS=
+    BDW_GC_LIBS="-lgc"
   else
     dnl bdw-gw options passed by configure flags
     if test "x$with_target_bdw_gc_include" = x && test "x$with_target_bdw_gc_lib" != x; then