stdcxx-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From far...@apache.org
Subject svn commit: r629815 - /stdcxx/branches/4.2.x/etc/config/GNUmakefile.cfg
Date Thu, 21 Feb 2008 14:54:58 GMT
Author: faridz
Date: Thu Feb 21 06:54:57 2008
New Revision: 629815

URL: http://svn.apache.org/viewvc?rev=629815&view=rev
Log:
2008-02-21  Farid Zaripov  <farid_zaripov@epam.com>

	Merged r629812 from trunk with a fix for 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/branches/4.2.x/etc/config/GNUmakefile.cfg

Modified: stdcxx/branches/4.2.x/etc/config/GNUmakefile.cfg
URL: http://svn.apache.org/viewvc/stdcxx/branches/4.2.x/etc/config/GNUmakefile.cfg?rev=629815&r1=629814&r2=629815&view=diff
==============================================================================
--- stdcxx/branches/4.2.x/etc/config/GNUmakefile.cfg (original)
+++ stdcxx/branches/4.2.x/etc/config/GNUmakefile.cfg Thu Feb 21 06:54:57 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                                                 \



Mime
View raw message