[llvm-commits] [poolalloc] r155768 - in /poolalloc/trunk/runtime: DynCount/Makefile DynamicTypeChecks/Makefile FL2Allocator/Makefile HeapFrag/Makefile PreRT/Makefile

[Will Dietz]

Author: wdietz2
Date: Sat Apr 28 16:46:07 2012
New Revision: 155768

URL: http://llvm.org/viewvc/llvm-project?rev=155768&view=rev
Log:
Build bytecode on non-Mac platforms, apparently include order matters.

Modified:
    poolalloc/trunk/runtime/DynCount/Makefile
    poolalloc/trunk/runtime/DynamicTypeChecks/Makefile
    poolalloc/trunk/runtime/FL2Allocator/Makefile
    poolalloc/trunk/runtime/HeapFrag/Makefile
    poolalloc/trunk/runtime/PreRT/Makefile

Modified: poolalloc/trunk/runtime/DynCount/Makefile
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/runtime/DynCount/Makefile?rev=155768&r1=155767&r2=155768&view=diff
==============================================================================
--- poolalloc/trunk/runtime/DynCount/Makefile (original)
+++ poolalloc/trunk/runtime/DynCount/Makefile Sat Apr 28 16:46:07 2012
@@ -18,7 +18,6 @@
 endif
 
 CXX.Flags += -fno-threadsafe-statics
-include $(LEVEL)/Makefile.common
 
 #
 # Do not build bitcode library on Mac OS X; XCode will pre-install llvm-gcc,
@@ -29,5 +28,7 @@
 BYTECODE_LIBRARY=1
 endif
 
+include $(LEVEL)/Makefile.common
+
 # Always build optimized and debug versions
 all:: $(LIBNAME_OBJO) $(LIBNAME_OBJG)

Modified: poolalloc/trunk/runtime/DynamicTypeChecks/Makefile
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/runtime/DynamicTypeChecks/Makefile?rev=155768&r1=155767&r2=155768&view=diff
==============================================================================
--- poolalloc/trunk/runtime/DynamicTypeChecks/Makefile (original)
+++ poolalloc/trunk/runtime/DynamicTypeChecks/Makefile Sat Apr 28 16:46:07 2012
@@ -16,8 +16,6 @@
 CXXFLAGS += -DNDEBUG=1
 endif
 
-include $(LEVEL)/Makefile.common
-
 #
 # Do not build bitcode library on Mac OS X; XCode will pre-install llvm-gcc,
 # and that can cause the build to fail if it doesn't match the current version
@@ -27,5 +25,7 @@
 BYTECODE_LIBRARY=1
 endif
 
+include $(LEVEL)/Makefile.common
+
 # Always build optimized and debug versions
 all:: $(LIBNAME_OBJO) $(LIBNAME_OBJG)

Modified: poolalloc/trunk/runtime/FL2Allocator/Makefile
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/runtime/FL2Allocator/Makefile?rev=155768&r1=155767&r2=155768&view=diff
==============================================================================
--- poolalloc/trunk/runtime/FL2Allocator/Makefile (original)
+++ poolalloc/trunk/runtime/FL2Allocator/Makefile Sat Apr 28 16:46:07 2012
@@ -17,8 +17,6 @@
 
 CXXFLAGS += -fno-exceptions
 
-include $(LEVEL)/Makefile.common
-
 #
 # Do not build bitcode library on Mac OS X; XCode will pre-install llvm-gcc,
 # and that can cause the build to fail if it doesn't match the current version
@@ -28,3 +26,6 @@
 BYTECODE_LIBRARY=1
 endif
 
+include $(LEVEL)/Makefile.common
+
+

Modified: poolalloc/trunk/runtime/HeapFrag/Makefile
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/runtime/HeapFrag/Makefile?rev=155768&r1=155767&r2=155768&view=diff
==============================================================================
--- poolalloc/trunk/runtime/HeapFrag/Makefile (original)
+++ poolalloc/trunk/runtime/HeapFrag/Makefile Sat Apr 28 16:46:07 2012
@@ -11,8 +11,6 @@
 endif
 endif
 
-include $(LEVEL)/Makefile.common
-
 #
 # Do not build bitcode library on Mac OS X; XCode will pre-install llvm-gcc,
 # and that can cause the build to fail if it doesn't match the current version
@@ -22,5 +20,7 @@
 BYTECODE_LIBRARY=1
 endif
 
+include $(LEVEL)/Makefile.common
+
 # Always build optimized and debug versions
 all:: $(LIBNAME_OBJO) $(LIBNAME_OBJG)

Modified: poolalloc/trunk/runtime/PreRT/Makefile
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/runtime/PreRT/Makefile?rev=155768&r1=155767&r2=155768&view=diff
==============================================================================
--- poolalloc/trunk/runtime/PreRT/Makefile (original)
+++ poolalloc/trunk/runtime/PreRT/Makefile Sat Apr 28 16:46:07 2012
@@ -1,8 +1,6 @@
 LEVEL = ../..
 LIBRARYNAME=pa_pre_rt
 
-include $(LEVEL)/Makefile.common
-
 #
 # Do not build bitcode library on Mac OS X; XCode will pre-install llvm-gcc,
 # and that can cause the build to fail if it doesn't match the current version
@@ -12,3 +10,5 @@
 BYTECODE_LIBRARY=1
 endif
 
+include $(LEVEL)/Makefile.common
+