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/20 19:23:56 UTC
svn commit: r629561 - /stdcxx/trunk/etc/config/GNUmakefile.cfg
Author: faridz
Date: Wed Feb 20 10:23:52 2008
New Revision: 629561
URL: http://svn.apache.org/viewvc?rev=629561&view=rev
Log:
2008-02-20 Farid Zaripov <fa...@epam.com>
STDCXX-733
* etc/config/GNUmakefile.cfg: Reverting changes introduced in
r627618 to fix STDCXX-733 issue.
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=629561&r1=629560&r2=629561&view=diff
==============================================================================
--- stdcxx/trunk/etc/config/GNUmakefile.cfg (original)
+++ stdcxx/trunk/etc/config/GNUmakefile.cfg Wed Feb 20 10:23:52 2008
@@ -363,17 +363,13 @@
-e "s/_RWSTD_NO_//g" -e "s/_RWSTD_//g"` ; \
for sym in $$dep ; do \
fname=$$sym ; \
- src=$(SRCDIR)/$$fname.cpp; \
- [ ! -r $$src ] && fname="NO_$$fname" ; \
+ [ ! -r $(SRCDIR)/$$fname.cpp ] && fname="NO_$$fname" ; \
grep "_RWSTD_NO_$$sym$$" config.h >/dev/null ; \
if [ $$? -ne 0 ] ; then \
- grep "[^a-zA-Z0-9_]*main *(" $$src >/dev/null 2>&1 ; \
+ grep "[^a-zA-Z0-9_]*main *(" $(SRCDIR)/$$fname.cpp \
+ >/dev/null 2>&1 ; \
if [ $$? -eq 0 ] ; then \
- opts=`sed -n \
- "s/^[^A-Z_a-z0-9]*LDOPTS *= *\(.*\)/\1/p" \
- $$src`; \
- targets="$$fname.o $$fname run RUN=$$fname" \
- "$(LOPT)=$$opts" ; \
+ targets="$$fname.o $$fname run RUN=$$fname" ; \
elif [ `echo $$fname | grep "\.lib"` ] ; then \
targets="$$fname$(LIBSUFFIX) $(LOPT)=" ; \
else \