2N/A--- stdcxx-4.2.1/etc/config/GNUmakefile.cfg 2008-04-24 17:25:50.000000000 -0700

2N/A+++ stdcxx-4.2.1/etc/config/GNUmakefile.cfg 2009-07-25 14:57:02.019814635 -0700

326N/A@@ -54,13 +54,22 @@

326N/A #

326N/A ########################################################################

326N/A

326N/A+arch := $(shell mach)

326N/A+

326N/A+ifeq ($(arch),sparc)

326N/A+ XREGS := -xregs=appl

326N/A+ XMEMALIGN := -xmemalign=8i

326N/A+else

326N/A+ XREGS := -xregs=no%frameptr

326N/A+ XMEMALIGN :=

326N/A+endif

326N/A+

326N/A include ../makefile.in

326N/A

326N/A SRCDIR = $(TOPDIR)/etc/config/src

326N/A VPATH = $(SRCDIR)

326N/A

1902N/A CPPFLAGS += -I.

2N/A-CPPFLAGS := $(filter-out -I$(TOPDIR)/include/ansi,$(CPPFLAGS))

2N/A

2N/A CXXFLAGS += $(WARNFLAGS)

2N/A

2N/A@@ -74,12 +83,13 @@

2N/A DASH_H = -H

2N/A

2N/A CCNAME = $(CXX)-$(CCVER)

2N/A-LOGFILE = config.log

2N/A+LOGFILE = $(TOPDIR)/config.log

2N/A

2N/A # can't use LDOPTS when working with HP aCC, it's used by the linker

2N/A ifneq ($(CXX),aCC)

2N/A LOPT = LDOPTS

2N/A LDFLAGS += $(LDOPTS)

2N/A+ LDFLAGS += -R$(TOPDIR)/build/include

256N/A else

2N/A LOPT = _LDOPTS

2N/A LDFLAGS += $(_LDOPTS)

2N/A@@ -113,9 +123,9 @@

2N/A # $(2): executable file name

2N/A # $(3): additional linker flags (optional)

2N/A define link

2N/A- command="$(LD) $(1) $(LDFLAGS) $(3) -o $(2)"; \

2N/A+ command="$(CXX) $(CXXFLAGS) $(1) $(LDFLAGS) $(LDOPTS) $(3) -o $(2)"; \

2N/A echo "$$command" >>$(LOGFILE); \

12N/A- $(LD) $(1) $(LDFLAGS) $(3) -o $(2) >>$(LOGFILE) 2>&1

12N/A+ $(CXX) $(CXXFLAGS) $(1) $(LDFLAGS) $(LDOPTS) $(3) -o $(2) >>$(LOGFILE) 2>&1

12N/A endef

12N/A

12N/A # helper function to compile and link a file and log results

12N/A@@ -127,10 +137,10 @@

12N/A # $(5): additional linker flags (optional)

12N/A define compile_then_link

12N/A command="$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(4) -c $(1) -o $(2)" \

12N/A- "&& $(LD) $(2) $(LDFLAGS) $(5) -o $(3)"; \

12N/A+ "&& $(CXX) $(CXXFLAGS) $(2) $(LDFLAGS) $(LDOPTS) $(5) -o $(3)"; \

12N/A echo "$$command" >>$(LOGFILE); \

12N/A $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(4) -c $(1) -o $(2) >>$(LOGFILE) 2>&1 \

12N/A- && $(LD) $(2) $(LDFLAGS) $(5) -o $(3) >>$(LOGFILE) 2>&1

12N/A+ && $(CXX) $(CXXFLAGS) $(2) $(LDFLAGS) $(LDOPTS) $(5) -o $(3) >>$(LOGFILE) 2>&1

12N/A endef

12N/A

12N/A # helper function to prelink a file and log results

12N/A@@ -181,7 +191,7 @@

12N/A if [ $$? -eq 0 ] ; then \

12N/A opts=`sed -n "s/^[^A-Z_a-z0-9]*LDOPTS *= *\(.*\)/\1/p" \

12N/A $$src`; \

12N/A- targets="$$file.o $$file run RUN=$$file $(LOPT)=$$opts"; \

12N/A+ targets="$$file.o $$file run RUN=$$file LDOPTS=$$opts $(LOPT)=$$opts"; \

12N/A elif [ `echo $$file | grep "\.lib"` ] ; then \

2N/A targets="$$file$(LIBSUFFIX)" ; \

2N/A elif [ `echo $$file | grep "\.sh"` ] ; then \

2N/A