stdcxx-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From far...@apache.org
Subject svn commit: r544860 - in /incubator/stdcxx/trunk/etc/config: GNUmakefile.lib makefile.rules
Date Wed, 06 Jun 2007 14:51:12 GMT
Author: faridz
Date: Wed Jun  6 07:51:11 2007
New Revision: 544860

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

	STDCXX-422
	* GNUmakefile.lib [CYGWIN]: changed name of the library to libstd${BUILDTYPE}-X.Y.Z.dll
	* makefile.rules [CYGWIN]: add $(LIBDIR) to PATH

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

Modified: incubator/stdcxx/trunk/etc/config/GNUmakefile.lib
URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/etc/config/GNUmakefile.lib?view=diff&rev=544860&r1=544859&r2=544860
==============================================================================
--- incubator/stdcxx/trunk/etc/config/GNUmakefile.lib (original)
+++ incubator/stdcxx/trunk/etc/config/GNUmakefile.lib Wed Jun  6 07:51:11 2007
@@ -20,7 +20,12 @@
 LIBLINK := $(LIBNAME)
 
 ifeq ($(findstring shared,$(BUILDMODE)),shared)
-  LIB    := $(LIBLINK).$(LIBVER)
+  ifneq ($(LIBSUFFIX),.dll)
+    LIB  := $(LIBLINK).$(LIBVER)
+  else
+    # on Cygwin use name libstd${BUILDTYPE}-X.Y.Z.dll
+    LIB  := $(basename $(LIBLINK))-$(LIBVER)$(LIBSUFFIX)
+  endif
   TARGET := $(LIB) $(LIBLINK)
 else
   LIB    := $(LIBLINK)

Modified: incubator/stdcxx/trunk/etc/config/makefile.rules
URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/etc/config/makefile.rules?view=diff&rev=544860&r1=544859&r2=544860
==============================================================================
--- incubator/stdcxx/trunk/etc/config/makefile.rules (original)
+++ incubator/stdcxx/trunk/etc/config/makefile.rules Wed Jun  6 07:51:11 2007
@@ -112,6 +112,8 @@
 # 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)
+
 run runall run_all: $(BINDIR)/exec
 	@(LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:$(LIBDIR);                    \
         PATH=$$PATH:.;                                                    \
@@ -123,6 +125,22 @@
         mkdir -p $$TMP;                                                   \
         ./run $(RUNFLAGS) $(RUNTARGET);                                   \
         exit 0)
+
+else
+# on Cygwin add $(LIBDIR) to PATH
+run runall run_all: $(BINDIR)/exec
+	@(LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:$(LIBDIR);                    \
+        PATH=$$PATH:$(LIBDIR):.;                                          \
+        TOPDIR=$(TOPDIR);                                                 \
+        TMP=$${TMP:-/tmp}/stdcxx-run-$$$$;                                \
+        export TMP;                                                       \
+        export LD_LIBRARY_PATH PATH TMP TOPDIR;                           \
+        trap "rm -rf $$TMP" HUP INT QUIT TERM EXIT;                       \
+        mkdir -p $$TMP;                                                   \
+        ./run $(RUNFLAGS) $(RUNTARGET);                                   \
+        exit 0)
+
+endif
 
 # include the automatically generated dependencies unless "clean"
 # or similar is one of the targets



Mime
View raw message