diff options
| author | Paolo Bonzini <bonzini@gnu.org> | 2010-10-28 10:58:48 +0000 |
|---|---|---|
| committer | Paolo Bonzini <bonzini@gcc.gnu.org> | 2010-10-28 10:58:48 +0000 |
| commit | 2a6fa9aeede4ec1fc977aca8d0ddb8d8f2f89ab9 (patch) | |
| tree | 3843f435fe3b85fadf4335771cfd3a46e6551b0b /boehm-gc/Makefile.am | |
| parent | c575a65f66db572f4fbec024465544dbdd647685 (diff) | |
| download | gcc-2a6fa9aeede4ec1fc977aca8d0ddb8d8f2f89ab9.zip gcc-2a6fa9aeede4ec1fc977aca8d0ddb8d8f2f89ab9.tar.gz gcc-2a6fa9aeede4ec1fc977aca8d0ddb8d8f2f89ab9.tar.bz2 | |
configure.ac: Rewrite DGUX check to use GC_CFLAGS, and -O0 check to remove the need for MY_CFLAGS.
2010-10-28 Paolo Bonzini <bonzini@gnu.org>
* configure.ac: Rewrite DGUX check to use GC_CFLAGS, and -O0 check
to remove the need for MY_CFLAGS.
* Makefile.am: Do not use @...@ substitutions. Use AM_CXXFLAGS,
AM_CFLAGS and AM_LDFLAGS instead of redefining LTCOMPILE and LINK.
Use "override" to disable -O2 when required.
* configure: Regenerate.
* Makefile.in: Regenerate.
* include/Makefile.in: Regenerate.
From-SVN: r166028
Diffstat (limited to 'boehm-gc/Makefile.am')
| -rw-r--r-- | boehm-gc/Makefile.am | 25 |
1 files changed, 8 insertions, 17 deletions
diff --git a/boehm-gc/Makefile.am b/boehm-gc/Makefile.am index df8de1e..358614f 100644 --- a/boehm-gc/Makefile.am +++ b/boehm-gc/Makefile.am @@ -33,20 +33,20 @@ mips_sgi_mach_dep.s mips_ultrix_mach_dep.s powerpc_darwin_mach_dep.s \ rs6000_mach_dep.s sparc_mach_dep.S sparc_netbsd_mach_dep.s \ sparc_sunos4_mach_dep.s ia64_save_regs_in_stack.s -extra_ldflags_libgc = @extra_ldflags_libgc@ - # Include THREADLIBS here to ensure that the correct versions of # linuxthread semaphore functions get linked: -libgcjgc_la_LIBADD = @addobjs@ $(THREADLIBS) $(UNWINDLIBS) -libgcjgc_la_DEPENDENCIES = @addobjs@ +libgcjgc_la_LIBADD = $(addobjs) $(THREADLIBS) $(UNWINDLIBS) +libgcjgc_la_DEPENDENCIES = $(addobjs) libgcjgc_la_LDFLAGS = $(extra_ldflags_libgc) -version-info 1:2:0 -rpath $(toolexeclibdir) libgcjgc_la_LINK = $(LINK) $(libgcjgc_la_LDFLAGS) -libgcjgc_convenience_la_LIBADD = @addobjs@ -libgcjgc_convenience_la_DEPENDENCIES = @addobjs@ +libgcjgc_convenience_la_LIBADD = $(addobjs) +libgcjgc_convenience_la_DEPENDENCIES = $(addobjs) -AM_CXXFLAGS = @GC_CFLAGS@ -AM_CFLAGS = @GC_CFLAGS@ +AM_CXXFLAGS = $(GC_CFLAGS) +AM_CFLAGS = $(GC_CFLAGS) +AM_LDFLAGS = $(shell $(top_srcdir)/../libtool-ldflags $(LDFLAGS)) +override CFLAGS := $(filter-out $(O0_CFLAGS), $(CFLAGS)) $(O0_CFLAGS) test_ldadd = libgcjgc.la $(THREADLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS) @@ -93,15 +93,6 @@ libstaticrootslib_la_DEPENDENCIES = libgcjgc_convenience.la .S.lo: $(LTCOMPILE) -Wp,-P -x assembler-with-cpp -c $< -## We have our own definition of LTCOMPILE because we want to use our -## CFLAGS, not those passed in from the top level make. -LTCOMPILE = $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile \ - $(CC) $(DEFS) $(AM_CPPFLAGS) $(CPPFLAGS) \ - $(AM_CFLAGS) $(MY_CFLAGS) $(GC_CFLAGS) -LTLDFLAGS = $(shell $(top_srcdir)/../libtool-ldflags $(LDFLAGS)) -LINK = $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \ - $(CC) $(AM_CFLAGS) $(MY_CFLAGS) $(LTLDFLAGS) -o $@ - # Work around what appears to be a GNU make bug handling MAKEFLAGS # values defined in terms of make variables, as is the case for CC and # friends when we are called from the top level Makefile. |