Commit 207b1744 by Tristan Gingold Committed by Arnaud Charlet

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
parent c3ed1992
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> 2009-11-30 Emmanuel Briot <briot@adacore.com>
* gnat_ugn.texi: Extend doc for -eL * gnat_ugn.texi: Extend doc for -eL
......
...@@ -190,6 +190,11 @@ TOOLSCASE = ...@@ -190,6 +190,11 @@ TOOLSCASE =
MULTISUBDIR = MULTISUBDIR =
RTSDIR = rts$(subst /,_,$(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. # End of variables for you to override.
all: all.indirect all: all.indirect
...@@ -2116,6 +2121,7 @@ ifeq ($(strip $(filter-out darwin%,$(osys))),) ...@@ -2116,6 +2121,7 @@ ifeq ($(strip $(filter-out darwin%,$(osys))),)
PREFIX_OBJS=$(PREFIX_REAL_OBJS) PREFIX_OBJS=$(PREFIX_REAL_OBJS)
LIBRARY_VERSION := $(LIB_VERSION) LIBRARY_VERSION := $(LIB_VERSION)
soext = .dylib soext = .dylib
GCC_LINK_FLAGS=
endif endif
ifneq ($(EH_MECHANISM),) ifneq ($(EH_MECHANISM),)
...@@ -2182,7 +2188,7 @@ ADA_INCLUDE_SRCS =\ ...@@ -2182,7 +2188,7 @@ ADA_INCLUDE_SRCS =\
LIBGNAT=../$(RTSDIR)/libgnat.a 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 # 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 # it hides the runtime files lying with the rest of the sources
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment