[cfe-commits] r129561 - in /cfe/trunk/runtime: Makefile compiler-rt/ compiler-rt/Makefile

[Nick Lewycky]

Author: nicholas
Date: Fri Apr 15 01:57:32 2011
New Revision: 129561

URL: http://llvm.org/viewvc/llvm-project?rev=129561&view=rev
Log:
Create a compiler-rt directory and move the Makefile to it. Add a makefile that
builds the subdirs from this directory. This makes the behaviour with make match
what already happens with cmake.

Added:
    cfe/trunk/runtime/Makefile
    cfe/trunk/runtime/compiler-rt/
    cfe/trunk/runtime/compiler-rt/Makefile
      - copied, changed from r129427, cfe/trunk/runtime/Makefile

Added: cfe/trunk/runtime/Makefile
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/runtime/Makefile?rev=129561&view=auto
==============================================================================
--- cfe/trunk/runtime/Makefile (added)
+++ cfe/trunk/runtime/Makefile Fri Apr 15 01:57:32 2011
@@ -0,0 +1,21 @@
+##===- runtime/Makefile ------------------------------------*- Makefile -*-===##
+# 
+#                     The LLVM Compiler Infrastructure
+#
+# This file is distributed under the University of Illinois Open Source
+# License. See LICENSE.TXT for details.
+# 
+##===----------------------------------------------------------------------===##
+
+CLANG_LEVEL := ..
+include $(CLANG_LEVEL)/../../Makefile.config
+
+ifndef NO_RUNTIME_LIBS
+
+PARALLEL_DIRS  := libcxx compiler-rt
+
+endif
+
+include $(CLANG_LEVEL)/Makefile
+
+install::

Copied: cfe/trunk/runtime/compiler-rt/Makefile (from r129427, cfe/trunk/runtime/Makefile)
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/runtime/compiler-rt/Makefile?p2=cfe/trunk/runtime/compiler-rt/Makefile&p1=cfe/trunk/runtime/Makefile&r1=129427&r2=129561&rev=129561&view=diff
==============================================================================
--- cfe/trunk/runtime/Makefile (original)
+++ cfe/trunk/runtime/compiler-rt/Makefile Fri Apr 15 01:57:32 2011
@@ -1,4 +1,4 @@
-##===- clang/runtime/Makefile ------------------------------*- Makefile -*-===##
+##===- runtime/compiler-rt/Makefile ------------------------*- Makefile -*-===##
 #
 #                     The LLVM Compiler Infrastructure
 #
@@ -13,7 +13,7 @@
 #
 ##===----------------------------------------------------------------------===##
 
-CLANG_LEVEL := ..
+CLANG_LEVEL := ../..
 include $(CLANG_LEVEL)/Makefile
 
 CLANG_VERSION := $(word 3,$(shell grep "CLANG_VERSION " \