On Jan 17, 2012, at 11:59 AM, Bob Wilson wrote: > On Jan 17, 2012, at 8:09 AM, Howard Hinnant wrote: > >> Author: hhinnant >> Date: Tue Jan 17 10:09:32 2012 >> New Revision: 148309 >> >> URL: http://llvm.org/viewvc/llvm-project?rev=148309&view=rev >> Log: >> Stop installing headers, this is now done by clang > > Not anymore -- you just broke it. We're using that do-installhdrs target > that you removed (as noted in the comment).
Thanks for the catch Bob. Just recommitted. Please review. Howard > >> >> Modified: >> libcxx/trunk/Makefile >> >> Modified: libcxx/trunk/Makefile >> URL: >> http://llvm.org/viewvc/llvm-project/libcxx/trunk/Makefile?rev=148309&r1=148308&r2=148309&view=diff >> ============================================================================== >> --- libcxx/trunk/Makefile (original) >> +++ libcxx/trunk/Makefile Tue Jan 17 10:09:32 2012 >> @@ -30,26 +30,7 @@ >> >> clean:: >> >> -installhdrs:: >> - >> - $(MAKE) HEADER_DIR=$(INSTALL_DIR)/usr/include do-installhdrs >> - $(MAKE) HEADER_DIR=$(INSTALL_DIR)/usr/lib do-installhdrs >> - $(MAKE) HEADER_DIR=$(INSTALL_DIR)/usr/clang-ide/lib do-installhdrs >> - $(MAKE) HEADER_DIR=$(INSTALL_DIR)/Developer/usr/lib do-installhdrs >> - $(MAKE) >> HEADER_DIR=$(INSTALL_DIR)/Developer/Platforms/iPhoneOS.platform/usr/lib >> do-installhdrs >> - >> -# The do-installhdrs target is also used by clang's runtime/libcxx makefile. >> -do-installhdrs: >> - mkdir -p $(HEADER_DIR)/c++/v1/ext >> - rsync -r --exclude=".*" --exclude="support" $(SRCDIRS)/include/* \ >> - $(HEADER_DIR)/c++/v1/ >> - chown -R root:wheel $(HEADER_DIR)/c++ >> - chmod 755 $(HEADER_DIR)/c++/v1 >> - chmod 644 $(HEADER_DIR)/c++/v1/* >> - chmod 755 $(HEADER_DIR)/c++/v1/ext >> - chmod 644 $(HEADER_DIR)/c++/v1/ext/* >> - >> -install:: installhdrs $(DESTDIR) >> +install:: >> >> cd lib && ./buildit >> ditto lib/libc++.1.dylib $(SYMROOT)/usr/lib/libc++.1.dylib >> >> >> _______________________________________________ >> cfe-commits mailing list >> [email protected] >> http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits > _______________________________________________ cfe-commits mailing list [email protected] http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
