stdcxx-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From far...@apache.org
Subject svn commit: r561060 - in /incubator/stdcxx/trunk/etc/config: GNUmakefile.exm makefile.rules
Date Mon, 30 Jul 2007 17:39:51 GMT
Author: faridz
Date: Mon Jul 30 10:39:50 2007
New Revision: 561060

URL: http://svn.apache.org/viewvc?view=rev&rev=561060
Log:
2007-07-30 Farid Zaripov <Farid_Zaripov@epam.com>

	* GNUmakefile.exm: Set TZ environment variable only for examples.
	* makefile.rules: Determine cygwin using PLATFORM variable.
	[CYGWIN]: Add $(BINDIR) to PATH.

Modified:
    incubator/stdcxx/trunk/etc/config/GNUmakefile.exm
    incubator/stdcxx/trunk/etc/config/makefile.rules

Modified: incubator/stdcxx/trunk/etc/config/GNUmakefile.exm
URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/etc/config/GNUmakefile.exm?view=diff&rev=561060&r1=561059&r2=561060
==============================================================================
--- incubator/stdcxx/trunk/etc/config/GNUmakefile.exm (original)
+++ incubator/stdcxx/trunk/etc/config/GNUmakefile.exm Mon Jul 30 10:39:50 2007
@@ -50,4 +50,7 @@
 realclean: dependclean clean
 	rm -f *.out
 
+#set TZ environment variable for examples
+run runall run_all: TZ = MST+7
+
 include ../makefile.rules

Modified: incubator/stdcxx/trunk/etc/config/makefile.rules
URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/etc/config/makefile.rules?view=diff&rev=561060&r1=561059&r2=561060
==============================================================================
--- incubator/stdcxx/trunk/etc/config/makefile.rules (original)
+++ incubator/stdcxx/trunk/etc/config/makefile.rules Mon Jul 30 10:39:50 2007
@@ -112,14 +112,13 @@
 # PlumHall specific:
 # for all "top level" tests that failed to build, find and build all
 # subtests (the little tests the main test consists of)
-ifneq ($(LIBSUFFIX),.dll)
+ifeq (,$(findstring cygwin,$(PLATFORM)))
 
 run runall run_all: $(BINDIR)/exec
 	@(LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:$(LIBDIR);                    \
         PATH=$$PATH:.;                                                    \
         TOPDIR=$(TOPDIR);                                                 \
         TMP=$${TMP:-/tmp}/stdcxx-run-$$$$;                                \
-        TZ=MST+7;                                                         \
         export TMP;                                                       \
         export LD_LIBRARY_PATH PATH TMP TOPDIR TZ;                        \
         trap "rm -rf $$TMP" HUP INT QUIT TERM EXIT;                       \
@@ -128,13 +127,12 @@
         exit 0)
 
 else
-# on Cygwin add $(LIBDIR) to PATH
+# on Cygwin add $(LIBDIR) and $(BINDIR) to PATH
 run runall run_all: $(BINDIR)/exec
 	@(LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:$(LIBDIR);                    \
-        PATH=$$PATH:$(LIBDIR):.;                                          \
+        PATH=$$PATH:$(LIBDIR):$(BINDIR):.;                                \
         TOPDIR=$(TOPDIR);                                                 \
         TMP=$${TMP:-/tmp}/stdcxx-run-$$$$;                                \
-        TZ=MST+7;                                                         \
         export TMP;                                                       \
         export LD_LIBRARY_PATH PATH TMP TOPDIR TZ;                        \
         trap "rm -rf $$TMP" HUP INT QUIT TERM EXIT;                       \



Mime
View raw message