diff options
-rw-r--r-- | clang/runtime/CMakeLists.txt | 1 | ||||
-rw-r--r-- | clang/runtime/Makefile | 2 | ||||
-rw-r--r-- | clang/runtime/compiler-rt/Makefile | 2 | ||||
-rw-r--r-- | clang/runtime/libcxx/Makefile | 35 |
4 files changed, 38 insertions, 2 deletions
diff --git a/clang/runtime/CMakeLists.txt b/clang/runtime/CMakeLists.txt index e53d805cbd6..68ee266ecae 100644 --- a/clang/runtime/CMakeLists.txt +++ b/clang/runtime/CMakeLists.txt @@ -2,6 +2,7 @@ set(known_subdirs "compiler-rt" + "libcxx" ) foreach (dir ${known_subdirs}) diff --git a/clang/runtime/Makefile b/clang/runtime/Makefile index 784eb66fc54..4b0625d4b61 100644 --- a/clang/runtime/Makefile +++ b/clang/runtime/Makefile @@ -12,7 +12,7 @@ include $(CLANG_LEVEL)/../../Makefile.config ifndef NO_RUNTIME_LIBS -PARALLEL_DIRS := compiler-rt +PARALLEL_DIRS := compiler-rt libcxx endif diff --git a/clang/runtime/compiler-rt/Makefile b/clang/runtime/compiler-rt/Makefile index 0d770db17c4..8888556738a 100644 --- a/clang/runtime/compiler-rt/Makefile +++ b/clang/runtime/compiler-rt/Makefile @@ -1,4 +1,4 @@ -##===- clang/runtime/Makefile ------------------------------*- Makefile -*-===## +##===- clang/runtime/compiler-rt/Makefile ------------------*- Makefile -*-===## # # The LLVM Compiler Infrastructure # diff --git a/clang/runtime/libcxx/Makefile b/clang/runtime/libcxx/Makefile new file mode 100644 index 00000000000..a65c906e8da --- /dev/null +++ b/clang/runtime/libcxx/Makefile @@ -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 |