[llvm-branch-commits] [cfe-tag] r94267 - /cfe/tags/Apple/clang/GNUSource.make

[Daniel Dunbar]

Author: ddunbar
Date: Fri Jan 22 18:45:39 2010
New Revision: 94267

URL: http://llvm.org/viewvc/llvm-project?rev=94267&view=rev
Log:
Add "temporary" hack to avoid merge-lipo problems with clang_rt resource
libraries. The problem is that ar timestamps entries, so merge-lipo thinks the
resource files should be merged.

Modified:
    cfe/tags/Apple/clang/GNUSource.make

Modified: cfe/tags/Apple/clang/GNUSource.make
URL: http://llvm.org/viewvc/llvm-project/cfe/tags/Apple/clang/GNUSource.make?rev=94267&r1=94266&r2=94267&view=diff

==============================================================================
--- cfe/tags/Apple/clang/GNUSource.make (original)
+++ cfe/tags/Apple/clang/GNUSource.make Fri Jan 22 18:45:39 2010
@@ -127,6 +127,9 @@
 	done
 	$(_v) rm -rf $(DSTROOT)
 	$(_v) mkdir -p $(DSTROOT)
+	$(_v) for arch in $(filter-out $(firstword $(RC_ARCHS)),$(RC_ARCHS)); do \
+		rm -rf $(BuildDirectory)/install-$$arch; \
+	done
 	./merge-lipo `for arch in $(RC_ARCHS) ; do echo $(BuildDirectory)/install-$$arch ; done` $(DSTROOT)
 	$(_v) $(FIND) $(DSTROOT) $(Find_Cruft) | $(XARGS) $(RMDIR)
 	$(_v) $(FIND) $(SYMROOT) $(Find_Cruft) | $(XARGS) $(RMDIR)