diff options
Diffstat (limited to 'libada')
| -rw-r--r-- | libada/ChangeLog | 11 | ||||
| -rw-r--r-- | libada/Makefile.in | 12 | ||||
| -rwxr-xr-x | libada/configure | 7 | ||||
| -rw-r--r-- | libada/configure.ac | 6 |
4 files changed, 15 insertions, 21 deletions
diff --git a/libada/ChangeLog b/libada/ChangeLog index 689e9fb1a32..fbcff774051 100644 --- a/libada/ChangeLog +++ b/libada/ChangeLog @@ -1,3 +1,14 @@ +2011-10-12 Eric Botcazou <ebotcazou@adacore.com> + + * Makefile.in (LOOSE_WARN): Delete. + (GCC_WARN_CFLAGS): Likewise. + (WARN_CFLAGS): Likewise. + (GNATLIBFLAGS): Add -nostdinc. + (GNATLIBCFLAGS_FOR_C): Add -W -Wall. + (LIBADA_FLAGS_TO_PASS): Remove WARN_CFLAGS. + * configure.ac (warn_cflags): Delete. + * configure: Regenerate. + 2011-08-22 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> * configure.ac: Include ../config/picflag.m4. diff --git a/libada/Makefile.in b/libada/Makefile.in index 6f3df38c322..86aff529dbd 100644 --- a/libada/Makefile.in +++ b/libada/Makefile.in @@ -45,21 +45,17 @@ AWK=@AWK@ # Variables for the user (or the top level) to override. objext=.o -GNATLIBFLAGS= -W -Wall -gnatpg THREAD_KIND=native TRACE=no LDFLAGS= # The tedious process of getting CFLAGS right. CFLAGS=-g -LOOSE_WARN = -W -Wall -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes -GCC_WARN_CFLAGS = $(LOOSE_WARN) -WARN_CFLAGS = @warn_cflags@ - PICFLAG = @PICFLAG@ +GNATLIBFLAGS= -W -Wall -gnatpg -nostdinc GNATLIBCFLAGS= -g -O2 -GNATLIBCFLAGS_FOR_C = $(GNATLIBCFLAGS) $(PICFLAG) -fexceptions \ - -DIN_RTS @have_getipinfo@ +GNATLIBCFLAGS_FOR_C = -W -Wall $(GNATLIBCFLAGS) $(PICFLAG) \ + -fexceptions -DIN_RTS @have_getipinfo@ host_subdir = @host_subdir@ GCC_DIR=$(MULTIBUILDTOP)../../$(host_subdir)/gcc @@ -91,7 +87,7 @@ LIBADA_FLAGS_TO_PASS = \ "exeext=.exeext.should.not.be.used " \ 'CC=the.host.compiler.should.not.be.needed' \ "GCC_FOR_TARGET=$(CC)" \ - "CFLAGS=$(CFLAGS) $(WARN_CFLAGS)" + "CFLAGS=$(CFLAGS)" # Rules to build gnatlib. .PHONY: gnatlib gnatlib-plain gnatlib-sjlj gnatlib-zcx gnatlib-shared oscons diff --git a/libada/configure b/libada/configure index c0a294fdd0c..1e0ceefc86a 100755 --- a/libada/configure +++ b/libada/configure @@ -553,7 +553,6 @@ PACKAGE_URL= ac_unique_file="Makefile.in" ac_subst_vars='LTLIBOBJS LIBOBJS -warn_cflags have_getipinfo default_gnatlib_target LN_S @@ -3007,12 +3006,6 @@ if test x$have_unwind_getipinfo = xyes; then fi -warn_cflags= -if test "x$GCC" = "xyes"; then - warn_cflags='$(GCC_WARN_CFLAGS)' -fi - - # Output: create a Makefile. ac_config_files="$ac_config_files Makefile" diff --git a/libada/configure.ac b/libada/configure.ac index f9b9c5ab3b0..1e3760cbe4c 100644 --- a/libada/configure.ac +++ b/libada/configure.ac @@ -144,12 +144,6 @@ if test x$have_unwind_getipinfo = xyes; then fi AC_SUBST(have_getipinfo) -warn_cflags= -if test "x$GCC" = "xyes"; then - warn_cflags='$(GCC_WARN_CFLAGS)' -fi -AC_SUBST(warn_cflags) - # Output: create a Makefile. AC_CONFIG_FILES([Makefile]) |