Mercurial > hg > CbC > CbC_gcc
diff libssp/Makefile.am @ 67:f6334be47118
update gcc from gcc-4.6-20100522 to gcc-4.6-20110318
| author | nobuyasu <dimolto@cr.ie.u-ryukyu.ac.jp> |
|---|---|
| date | Tue, 22 Mar 2011 17:18:12 +0900 |
| parents | 77e2b8dfacca |
| children | 04ced10e8804 |
line wrap: on
line diff
--- a/libssp/Makefile.am Tue May 25 18:58:51 2010 +0900 +++ b/libssp/Makefile.am Tue Mar 22 17:18:12 2011 +0900 @@ -1,6 +1,6 @@ ## Makefile for the toplevel directory of the libssp library. ## -## Copyright (C) 2005 +## Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 ## Free Software Foundation, Inc. ## @@ -12,8 +12,23 @@ gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER) if LIBSSP_USE_SYMVER +if LIBSSP_USE_SYMVER_GNU version_arg = -Wl,--version-script=$(srcdir)/ssp.map version_dep = $(srcdir)/ssp.map +endif +if LIBSSP_USE_SYMVER_SUN +version_arg = -Wl,-M,ssp.map-sun +version_dep = ssp.map-sun +ssp.map-sun : $(srcdir)/ssp.map \ + $(top_srcdir)/../contrib/make_sunver.pl \ + $(libssp_la_OBJECTS) $(libssp_la_LIBADD) + perl $(top_srcdir)/../contrib/make_sunver.pl \ + $(srcdir)/ssp.map \ + $(libssp_la_OBJECTS:%.lo=.libs/%.o) \ + `echo $(libssp_la_LIBADD) | \ + sed 's,/\([^/.]*\)\.la,/.libs/\1.a,g'` \ + > $@ || (rm -f $@ ; exit 1) +endif else version_arg = version_dep = @@ -35,7 +50,7 @@ libssp_la_LIBADD = libssp_la_DEPENDENCIES = $(version_dep) $(libssp_la_LIBADD) libssp_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` \ - $(version_arg) -no-undefined -bindir "$(bindir)" + $(version_arg) $(lt_host_flags) libssp_nonshared_la_SOURCES = \ ssp-local.c