[cfe-commits] r145168 - /cfe/trunk/runtime/libcxx/Makefile

Bob Wilson bob.wilson at apple.com
Sat Nov 26 22:13:25 PST 2011


Author: bwilson
Date: Sun Nov 27 00:13:25 2011
New Revision: 145168

URL: http://llvm.org/viewvc/llvm-project?rev=145168&view=rev
Log:
Use libcxx makefile's do-installhdrs target.  <rdar://problem/10397739>

Modified:
    cfe/trunk/runtime/libcxx/Makefile

Modified: cfe/trunk/runtime/libcxx/Makefile
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/runtime/libcxx/Makefile?rev=145168&r1=145167&r2=145168&view=diff
==============================================================================
--- cfe/trunk/runtime/libcxx/Makefile (original)
+++ cfe/trunk/runtime/libcxx/Makefile Sun Nov 27 00:13:25 2011
@@ -15,7 +15,7 @@
 CLANG_LEVEL := ../..
 include $(CLANG_LEVEL)/Makefile
 
-PROJ_libcxx_hdrs := $(DESTDIR)$(PROJ_prefix)/lib/c++/v1
+PROJ_libcxx_hdrs := $(DESTDIR)$(PROJ_prefix)/lib
 
 # Expect libcxx to be in llvm/projects/libcxx
 LIBCXX_SRC_ROOT := $(LLVM_SRC_ROOT)/projects/libcxx
@@ -24,12 +24,8 @@
 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/*
+	$(MAKE) -C $(LIBCXX_SRC_ROOT) \
+	  HEADER_DIR=$(PROJ_libcxx_hdrs) do-installhdrs
 
 endif
 endif





More information about the cfe-commits mailing list