diff options
| author | ktietz <ktietz@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-11-29 17:52:24 +0000 |
|---|---|---|
| committer | ktietz <ktietz@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-11-29 17:52:24 +0000 |
| commit | cb3103a13317f215c4904e2c0d43105dd5d8ae1c (patch) | |
| tree | 71c8629b2fa5a5867c27935aa5e0bc491f638d48 /libquadmath/Makefile.am | |
| parent | b6440e3988c72233c07315c5ae9a6ba7ffc12fe8 (diff) | |
| download | gcc-cb3103a13317f215c4904e2c0d43105dd5d8ae1c.tar.gz | |
2010-11-29 Kai Tietz <kai.tietz@onevision.com>
* configure: Regenerated.
* Makefile.in: Regenerated.
* configure.ac (ACX_NONCANONICAL_TARGET): Call it.
(target_alias): Use AC_SUBST for it.
(GCC_NO_EXECUTABLES): Call it.
(AC_PROG_CC): Improve multilib handling.
Check that gcc is used for compilation.
Use pattern from libssp for symbol versioning checking.
* Makefile.am (LTLDFLAGS): Removed.
(libquadmath_la_LDFLAGS): Add -no-undefined.
(libquadmath_la_LINK): Commented out.
(libquadmath_la_DEPENDENCIES): Add libquadmath_la_LIBADD.
(AM_MAKEFLAGS): Add hack for argument passing by top-level.
(MAKEOVERRIDES): New.
* aclocal.m4: Regenerated.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@167259 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libquadmath/Makefile.am')
| -rw-r--r-- | libquadmath/Makefile.am | 52 |
1 files changed, 45 insertions, 7 deletions
diff --git a/libquadmath/Makefile.am b/libquadmath/Makefile.am index 5f65a6643bd..ef876431d3d 100644 --- a/libquadmath/Makefile.am +++ b/libquadmath/Makefile.am @@ -33,15 +33,11 @@ version_arg = version_dep = endif -LTLDFLAGS = $(shell $(SHELL) $(top_srcdir)/../libtool-ldflags $(LDFLAGS)) \ - -no-undefined - - toolexeclib_LTLIBRARIES = libquadmath.la libquadmath_la_LIBADD = -libquadmath_la_LDFLAGS = $(LTLDFLAGS) -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(version_arg) -lm -libquadmath_la_LINK = $(LINK) $(libgfortran_la_LDFLAGS) -libquadmath_la_DEPENDENCIES = $(version_dep) +libquadmath_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` \ + $(version_arg) -no-undefined -bindir "$(bindir)" -lm +libquadmath_la_DEPENDENCIES = $(version_dep) $(libquadmath_la_LIBADD) include_HEADERS = quadmath.h quadmath_weak.h @@ -66,4 +62,46 @@ libquadmath_la_SOURCES = \ math/nanq.c math/tgammaq.c math/finiteq.c math/nextafterq.c \ math/truncq.c math/floorq.c math/powq.c +# 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. +AM_MAKEFLAGS = \ + "AR_FLAGS=$(AR_FLAGS)" \ + "CC_FOR_BUILD=$(CC_FOR_BUILD)" \ + "CFLAGS=$(CFLAGS)" \ + "CXXFLAGS=$(CXXFLAGS)" \ + "CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" \ + "CFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET)" \ + "INSTALL=$(INSTALL)" \ + "INSTALL_DATA=$(INSTALL_DATA)" \ + "INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \ + "INSTALL_SCRIPT=$(INSTALL_SCRIPT)" \ + "JC1FLAGS=$(JC1FLAGS)" \ + "LDFLAGS=$(LDFLAGS)" \ + "LIBCFLAGS=$(LIBCFLAGS)" \ + "LIBCFLAGS_FOR_TARGET=$(LIBCFLAGS_FOR_TARGET)" \ + "MAKE=$(MAKE)" \ + "MAKEINFO=$(MAKEINFO) $(MAKEINFOFLAGS)" \ + "PICFLAG=$(PICFLAG)" \ + "PICFLAG_FOR_TARGET=$(PICFLAG_FOR_TARGET)" \ + "SHELL=$(SHELL)" \ + "RUNTESTFLAGS=$(RUNTESTFLAGS)" \ + "exec_prefix=$(exec_prefix)" \ + "infodir=$(infodir)" \ + "libdir=$(libdir)" \ + "prefix=$(prefix)" \ + "includedir=$(includedir)" \ + "AR=$(AR)" \ + "AS=$(AS)" \ + "CC=$(CC)" \ + "CXX=$(CXX)" \ + "LD=$(LD)" \ + "LIBCFLAGS=$(LIBCFLAGS)" \ + "NM=$(NM)" \ + "PICFLAG=$(PICFLAG)" \ + "RANLIB=$(RANLIB)" \ + "DESTDIR=$(DESTDIR)" + +MAKEOVERRIDES= + endif |