On 12/15/14 10:29 PM, Justin Bogner wrote:
Jonathan Roelofs <[email protected]> writes:
Author: jroelofs
Date: Mon Dec 15 18:48:13 2014
New Revision: 224300
URL: http://llvm.org/viewvc/llvm-project?rev=224300&view=rev
Log:
Fix installheaders target's permissions
Modified:
libcxx/trunk/Makefile
Modified: libcxx/trunk/Makefile
URL:
http://llvm.org/viewvc/llvm-project/libcxx/trunk/Makefile?rev=224300&r1=224299&r2=224300&view=diff
==============================================================================
--- libcxx/trunk/Makefile (original)
+++ libcxx/trunk/Makefile Mon Dec 15 18:48:13 2014
@@ -43,6 +43,20 @@ installheaders::
chmod 644 $(HEADER_DIR)/c++/v1/ext/*
chmod 755 $(HEADER_DIR)/c++/v1/experimental
chmod 644 $(HEADER_DIR)/c++/v1/experimental/*
+ chmod 755 $(HEADER_DIR)/c++/v1/support
+ chmod 644 $(HEADER_DIR)/c++/v1/support/*
+ chmod 755 $(HEADER_DIR)/c++/v1/support/android
+ chmod 644 $(HEADER_DIR)/c++/v1/support/android/*
+ chmod 755 $(HEADER_DIR)/c++/v1/support/ibm
+ chmod 644 $(HEADER_DIR)/c++/v1/support/ibm/*
+ chmod 755 $(HEADER_DIR)/c++/v1/support/newlib
+ chmod 644 $(HEADER_DIR)/c++/v1/support/newlib/*
+ chmod 755 $(HEADER_DIR)/c++/v1/support/solaris
+ chmod 644 $(HEADER_DIR)/c++/v1/support/solaris/*
+ chmod 755 $(HEADER_DIR)/c++/v1/support/win32
+ chmod 644 $(HEADER_DIR)/c++/v1/support/win32/*
+ chmod 755 $(HEADER_DIR)/c++/v1/support/xlocale
+ chmod 644 $(HEADER_DIR)/c++/v1/support/xlocale/*
This doesn't make sense. Just above here, when we install these headers,
we exclude the support directory:
(cd $(SRCDIRS)/include && \
tar cf - --exclude=".*" --exclude=support \
--exclude=CMakeLists.txt *) | \
(cd $(HEADER_DIR)/c++/v1 && tar xf -)
This in turn means this chmod fails, as we see on this bot:
http://lab.llvm.org:8080/green/job/clang-stage1-configure-RA_build/2801/console:
chmod 755
/Users/buildslave/jenkins/sharedspace/phase1@2/clang-install/include/c++/v1/support
chmod:
/Users/buildslave/jenkins/sharedspace/phase1@2/clang-install/include/c++/v1/support:
No such file or directory
make[3]: *** [installheaders] Error 1
Let me know if I'm missing something here, but I've reverted this in
r224317 to get the bot green for now.
Sorry, I backported that from a branch I've got that didn't have the
"--exclude=support", which AFAICT, shouldn't be there. There are includes for
these support headers in <algorithm>, <cctype>, <cmath>, <cstdlib>, <cwchar>,
<limits>, <locale>, <__locale>, so they really do need to be installed.
Jon
--
Jon Roelofs
[email protected]
CodeSourcery / Mentor Embedded
_______________________________________________
cfe-commits mailing list
[email protected]
http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
