[cfe-commits] r140876 - in /cfe/trunk/runtime: CMakeLists.txt Makefile compiler-rt/Makefile libcxx/ libcxx/Makefile

[Bob Wilson]

Author: bwilson
Date: Fri Sep 30 15:24:28 2011
New Revision: 140876

URL: http://llvm.org/viewvc/llvm-project?rev=140876&view=rev
Log:
Install a copy of the libc++ headers with clang.  <rdar://problem/10096516>

Added:
    cfe/trunk/runtime/libcxx/
    cfe/trunk/runtime/libcxx/Makefile
Modified:
    cfe/trunk/runtime/CMakeLists.txt
    cfe/trunk/runtime/Makefile
    cfe/trunk/runtime/compiler-rt/Makefile

Modified: cfe/trunk/runtime/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/runtime/CMakeLists.txt?rev=140876&r1=140875&r2=140876&view=diff
==============================================================================
--- cfe/trunk/runtime/CMakeLists.txt (original)
+++ cfe/trunk/runtime/CMakeLists.txt Fri Sep 30 15:24:28 2011
@@ -2,6 +2,7 @@
 
 set(known_subdirs
   "compiler-rt"
+  "libcxx"
   )
 
 foreach (dir ${known_subdirs})

Modified: cfe/trunk/runtime/Makefile
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/runtime/Makefile?rev=140876&r1=140875&r2=140876&view=diff
==============================================================================
--- cfe/trunk/runtime/Makefile (original)
+++ cfe/trunk/runtime/Makefile Fri Sep 30 15:24:28 2011
@@ -12,7 +12,7 @@
 
 ifndef NO_RUNTIME_LIBS
 
-PARALLEL_DIRS  := compiler-rt
+PARALLEL_DIRS  := compiler-rt libcxx
 
 endif
 

Modified: cfe/trunk/runtime/compiler-rt/Makefile
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/runtime/compiler-rt/Makefile?rev=140876&r1=140875&r2=140876&view=diff
==============================================================================
--- cfe/trunk/runtime/compiler-rt/Makefile (original)
+++ cfe/trunk/runtime/compiler-rt/Makefile Fri Sep 30 15:24:28 2011
@@ -1,4 +1,4 @@
-##===- clang/runtime/Makefile ------------------------------*- Makefile -*-===##
+##===- clang/runtime/compiler-rt/Makefile ------------------*- Makefile -*-===##
 #
 #                     The LLVM Compiler Infrastructure
 #

Added: cfe/trunk/runtime/libcxx/Makefile
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/runtime/libcxx/Makefile?rev=140876&view=auto
==============================================================================
--- cfe/trunk/runtime/libcxx/Makefile (added)
+++ cfe/trunk/runtime/libcxx/Makefile Fri Sep 30 15:24:28 2011
@@ -0,0 +1,35 @@
+##===- clang/runtime/libcxx/Makefile -----------------------*- Makefile -*-===##
+#
+#                     The LLVM Compiler Infrastructure
+#
+# This file is distributed under the University of Illinois Open Source
+# License. See LICENSE.TXT for details.
+#
+##===----------------------------------------------------------------------===##
+#
+# This file defines support for installing a copy of the libcxx headers where
+# the driver expects them.
+#
+##===----------------------------------------------------------------------===##
+
+CLANG_LEVEL := ../..
+include $(CLANG_LEVEL)/Makefile
+
+PROJ_libcxx_hdrs := $(DESTDIR)$(PROJ_prefix)/lib/c++/v1
+
+# Expect libcxx to be in llvm/projects/libcxx
+LIBCXX_SRC_ROOT := $(LLVM_SRC_ROOT)/projects/libcxx
+
+ifneq ($(CLANG_NO_RUNTIME),1)
+ifeq ($(shell test -d $(LIBCXX_SRC_ROOT) && echo OK),OK)
+
+install-local::
+	mkdir -p $(PROJ_libcxx_hdrs)/ext
+	rsync -r --exclude=".*" $(LIBCXX_SRC_ROOT)/include/* $(PROJ_libcxx_hdrs)
+	chmod 755 $(PROJ_libcxx_hdrs)
+	chmod 644 $(PROJ_libcxx_hdrs)/*
+	chmod 755 $(PROJ_libcxx_hdrs)/ext
+	chmod 644 $(PROJ_libcxx_hdrs)/ext/*
+
+endif
+endif