diff options
| author | Tristan Gingold <gingold@adacore.com> | 2009-11-30 13:42:23 +0000 |
|---|---|---|
| committer | Arnaud Charlet <charlet@gcc.gnu.org> | 2009-11-30 14:42:23 +0100 |
| commit | 207b17442a9e3a2f0773373ec0f4ca27bda00e2d (patch) | |
| tree | eadbddc9f4db180269a2565ae6a3987d55420c74 /gcc | |
| parent | c3ed199275440686b6a35225d9b698c27b5bef24 (diff) | |
| download | gcc-207b17442a9e3a2f0773373ec0f4ca27bda00e2d.zip gcc-207b17442a9e3a2f0773373ec0f4ca27bda00e2d.tar.gz gcc-207b17442a9e3a2f0773373ec0f4ca27bda00e2d.tar.bz2 | |
Makefile.in: Do not link with -static-libgcc on Darwin.
2009-11-30 Tristan Gingold <gingold@adacore.com>
* gcc-interface/Makefile.in: Do not link with -static-libgcc on Darwin.
From-SVN: r154799
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ada/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/ada/gcc-interface/Makefile.in | 8 |
2 files changed, 11 insertions, 1 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 2090693..eab6c1c 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,7 @@ +2009-11-30 Tristan Gingold <gingold@adacore.com> + + * gcc-interface/Makefile.in: Do not link with -static-libgcc on Darwin. + 2009-11-30 Emmanuel Briot <briot@adacore.com> * gnat_ugn.texi: Extend doc for -eL diff --git a/gcc/ada/gcc-interface/Makefile.in b/gcc/ada/gcc-interface/Makefile.in index 5bb9900..0998226 100644 --- a/gcc/ada/gcc-interface/Makefile.in +++ b/gcc/ada/gcc-interface/Makefile.in @@ -190,6 +190,11 @@ TOOLSCASE = MULTISUBDIR = RTSDIR = rts$(subst /,_,$(MULTISUBDIR)) +# Link flags used to build gnat tools. By default we prefer to statically +# link with libgcc to avoid a dependency on shared libgcc (which is tricky +# to deal with as it may conflict with the libgcc provided by the system). +GCC_LINK_FLAGS=-static-libgcc + # End of variables for you to override. all: all.indirect @@ -2116,6 +2121,7 @@ ifeq ($(strip $(filter-out darwin%,$(osys))),) PREFIX_OBJS=$(PREFIX_REAL_OBJS) LIBRARY_VERSION := $(LIB_VERSION) soext = .dylib + GCC_LINK_FLAGS= endif ifneq ($(EH_MECHANISM),) @@ -2182,7 +2188,7 @@ ADA_INCLUDE_SRCS =\ LIBGNAT=../$(RTSDIR)/libgnat.a -GCC_LINK=$(CC) -static-libgcc $(ADA_INCLUDES) +GCC_LINK=$(CC) $(GCC_LINK_FLAGS) $(ADA_INCLUDES) # when compiling the tools, the runtime has to be first on the path so that # it hides the runtime files lying with the rest of the sources |