From ef0997542c5c996e43f9a8fb339a1f742bd2cd4a Mon Sep 17 00:00:00 2001 From: Alexandre Oliva Date: Wed, 24 Jan 2001 02:27:02 +0000 Subject: [PATCH] * ltcf-gcj.sh (lt_simple_link_test_code): Remove stray `(0)'. * libtool.m4 (_AC_LIBTOOL_GCJ): Pass $CPPFLAGS on. --- ChangeLog | 5 +++++ libtool.m4 | 5 +++-- ltcf-gcj.sh | 4 ++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index aefacdf0898..2f8fa70ff57 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2001-01-24 Alexandre Oliva + + * ltcf-gcj.sh (lt_simple_link_test_code): Remove stray `(0)'. + * libtool.m4 (_AC_LIBTOOL_GCJ): Pass $CPPFLAGS on. + 2000-11-07 Philip Blundell * Makefile.in (ETC_SUPPORT): Also add configbuild.* and configdev.*. diff --git a/libtool.m4 b/libtool.m4 index d732789657d..cb004e223ab 100644 --- a/libtool.m4 +++ b/libtool.m4 @@ -1,5 +1,6 @@ ## libtool.m4 - Configure libtool for the host system. -*-Shell-script-*- -## Copyright (C) 1996-1999,2000 Free Software Foundation, Inc. +## Copyright 1996, 1997, 1998, 1999, 2000, 2001 +## Free Software Foundation, Inc. ## Originally by Gordon Matzigkeit , 1996 ## ## This program is free software; you can redistribute it and/or modify @@ -802,7 +803,7 @@ lt_save_CC="$CC" lt_save_CFLAGS="$CFLAGS" dnl Make sure LTCC is set to the C compiler, i.e. set LTCC before CC dnl is set to the C++ compiler. -AR="$AR" LTCC="$CC" CC="$GCJ" CFLAGS="$GCJFLAGS" CPPFLAGS="" \ +AR="$AR" LTCC="$CC" CC="$GCJ" CFLAGS="$GCJFLAGS" CPPFLAGS="$CPPFLAGS" \ MAGIC_CMD="$MAGIC_CMD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \ LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" STRIP="$STRIP" \ AS="$AS" DLLTOOL="$DLLTOOL" OBJDUMP="$OBJDUMP" \ diff --git a/ltcf-gcj.sh b/ltcf-gcj.sh index acb30c0ace1..f82163dc147 100644 --- a/ltcf-gcj.sh +++ b/ltcf-gcj.sh @@ -2,7 +2,7 @@ # ltcf-gcj.sh - Create a GCJ compiler specific configuration # -# Copyright (C) 1996-1999,2000 Free Software Foundation, Inc. +# Copyright (C) 1996-1999, 2000, 2001 Free Software Foundation, Inc. # Originally by Gordon Matzigkeit , 1996 # # Original GCJ support by: @@ -38,7 +38,7 @@ objext=o lt_simple_compile_test_code="class foo {}" # Code to be used in simple link tests -lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {} (0); }' +lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }' ## Linker Characteristics case "$host_os" in -- 2.30.2