You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stdcxx.apache.org by fa...@apache.org on 2008/02/21 15:52:09 UTC
svn commit: r629812 - /stdcxx/trunk/etc/config/GNUmakefile.cfg
Author: faridz
Date: Thu Feb 21 06:52:08 2008
New Revision: 629812
URL: http://svn.apache.org/viewvc?rev=629812&view=rev
Log:
2008-02-21 Farid Zaripov <fa...@epam.com>
STDCXX-737
* etc/config/GNUmakefile.cfg: Check for the LDOPTS dependences
and setup LOPT variable when building the executable target
(restored r627618 after fixing bug).
Modified:
stdcxx/trunk/etc/config/GNUmakefile.cfg
Modified: stdcxx/trunk/etc/config/GNUmakefile.cfg
URL: http://svn.apache.org/viewvc/stdcxx/trunk/etc/config/GNUmakefile.cfg?rev=629812&r1=629811&r2=629812&view=diff
==============================================================================
--- stdcxx/trunk/etc/config/GNUmakefile.cfg (original)
+++ stdcxx/trunk/etc/config/GNUmakefile.cfg Thu Feb 21 06:52:08 2008
@@ -363,13 +363,17 @@
-e "s/_RWSTD_NO_//g" -e "s/_RWSTD_//g"` ; \
for sym in $$dep ; do \
fname=$$sym ; \
- [ ! -r $(SRCDIR)/$$fname.cpp ] && fname="NO_$$fname" ; \
+ src=$(SRCDIR)/$$fname.cpp; \
+ [ ! -r $$src ] && fname="NO_$$fname" ; \
grep "_RWSTD_NO_$$sym$$" config.h >/dev/null ; \
if [ $$? -ne 0 ] ; then \
- grep "[^a-zA-Z0-9_]*main *(" $(SRCDIR)/$$fname.cpp \
- >/dev/null 2>&1 ; \
+ grep "[^a-zA-Z0-9_]*main *(" $$src >/dev/null 2>&1 ; \
if [ $$? -eq 0 ] ; then \
- targets="$$fname.o $$fname run RUN=$$fname" ; \
+ opts=`sed -n \
+ "s/^[^A-Z_a-z0-9]*LDOPTS *= *\(.*\)/\1/p" \
+ $$src`; \
+ targets="$$fname.o $$fname run RUN=$$fname \
+ $(LOPT)=$$opts" ; \
elif [ `echo $$fname | grep "\.lib"` ] ; then \
targets="$$fname$(LIBSUFFIX) $(LOPT)=" ; \
else \