[llvm-commits] [poolalloc] r98065 - in /poolalloc/branches/release_26/runtime: FL2Allocator/Makefile FreeListAllocator/Makefile HeapFrag/Makefile PoolAllocator/Makefile PreRT/Makefile

[John Criswell]

Author: criswell
Date: Tue Mar  9 11:05:54 2010
New Revision: 98065

URL: http://llvm.org/viewvc/llvm-project?rev=98065&view=rev
Log:
Moved the library name to be the first thing listed after the LEVEL variable.
Disabled shared library support on Mingw and Cygwin since it isn't supported
at the moment.

Modified:
    poolalloc/branches/release_26/runtime/FL2Allocator/Makefile
    poolalloc/branches/release_26/runtime/FreeListAllocator/Makefile
    poolalloc/branches/release_26/runtime/HeapFrag/Makefile
    poolalloc/branches/release_26/runtime/PoolAllocator/Makefile
    poolalloc/branches/release_26/runtime/PreRT/Makefile

Modified: poolalloc/branches/release_26/runtime/FL2Allocator/Makefile
URL: http://llvm.org/viewvc/llvm-project/poolalloc/branches/release_26/runtime/FL2Allocator/Makefile?rev=98065&r1=98064&r2=98065&view=diff
==============================================================================
--- poolalloc/branches/release_26/runtime/FL2Allocator/Makefile (original)
+++ poolalloc/branches/release_26/runtime/FL2Allocator/Makefile Tue Mar  9 11:05:54 2010
@@ -1,7 +1,16 @@
 LEVEL = ../..
-SHARED_LIBRARY=1
 LIBRARYNAME=poolalloc_rt
 
+#
+# Build shared libraries on all platforms except Cygwin and MingW (which do
+# not support them).
+#
+ifneq ($(OS),Cygwin)
+ifneq ($(OS),MingW)
+SHARED_LIBRARY=1
+endif
+endif
+
 ifdef ENABLE_OPTIMIZED
 CXXFLAGS += -DNDEBUG=1
 endif

Modified: poolalloc/branches/release_26/runtime/FreeListAllocator/Makefile
URL: http://llvm.org/viewvc/llvm-project/poolalloc/branches/release_26/runtime/FreeListAllocator/Makefile?rev=98065&r1=98064&r2=98065&view=diff
==============================================================================
--- poolalloc/branches/release_26/runtime/FreeListAllocator/Makefile (original)
+++ poolalloc/branches/release_26/runtime/FreeListAllocator/Makefile Tue Mar  9 11:05:54 2010
@@ -1,5 +1,14 @@
 LEVEL = ../..
-SHARED_LIBRARY=1
 LIBRARYNAME=poolalloc_fl_rt
 
+#
+# Build shared libraries on all platforms except Cygwin and MingW (which do
+# not support them).
+#
+ifneq ($(OS),Cygwin)
+ifneq ($(OS),MingW)
+SHARED_LIBRARY=1
+endif
+endif
+
 include $(LEVEL)/Makefile.common

Modified: poolalloc/branches/release_26/runtime/HeapFrag/Makefile
URL: http://llvm.org/viewvc/llvm-project/poolalloc/branches/release_26/runtime/HeapFrag/Makefile?rev=98065&r1=98064&r2=98065&view=diff
==============================================================================
--- poolalloc/branches/release_26/runtime/HeapFrag/Makefile (original)
+++ poolalloc/branches/release_26/runtime/HeapFrag/Makefile Tue Mar  9 11:05:54 2010
@@ -1,7 +1,17 @@
 LEVEL = ../..
+LIBRARYNAME=heapfrag
+
 #BYTECODE_LIBRARY=1
+
+#
+# Build shared libraries on all platforms except Cygwin and MingW (which do
+# not support them).
+#
+ifneq ($(OS),Cygwin)
+ifneq ($(OS),MingW)
 #SHARED_LIBRARY=1
-LIBRARYNAME=heapfrag
+endif
+endif
 
 include $(LEVEL)/Makefile.common
 

Modified: poolalloc/branches/release_26/runtime/PoolAllocator/Makefile
URL: http://llvm.org/viewvc/llvm-project/poolalloc/branches/release_26/runtime/PoolAllocator/Makefile?rev=98065&r1=98064&r2=98065&view=diff
==============================================================================
--- poolalloc/branches/release_26/runtime/PoolAllocator/Makefile (original)
+++ poolalloc/branches/release_26/runtime/PoolAllocator/Makefile Tue Mar  9 11:05:54 2010
@@ -1,7 +1,16 @@
 LEVEL = ../..
-SHARED_LIBRARY=1
 LIBRARYNAME=poolalloc_rt_old
 
+#
+# Build shared libraries on all platforms except Cygwin and MingW (which do
+# not support them).
+#
+ifneq ($(OS),Cygwin)
+ifneq ($(OS),MingW)
+SHARED_LIBRARY=1
+endif
+endif
+
 include $(LEVEL)/Makefile.common
 
 # Always build optimized and debug versions

Modified: poolalloc/branches/release_26/runtime/PreRT/Makefile
URL: http://llvm.org/viewvc/llvm-project/poolalloc/branches/release_26/runtime/PreRT/Makefile?rev=98065&r1=98064&r2=98065&view=diff
==============================================================================
--- poolalloc/branches/release_26/runtime/PreRT/Makefile (original)
+++ poolalloc/branches/release_26/runtime/PreRT/Makefile Tue Mar  9 11:05:54 2010
@@ -1,6 +1,6 @@
 LEVEL = ../..
-BYTECODE_LIBRARY=1
 LIBRARYNAME=pa_pre_rt
+BYTECODE_LIBRARY=1
 
 include $(LEVEL)/Makefile.common