[llvm-commits] [llvm] r64109 - /llvm/branches/Apple/Dib/utils/buildit/build_llvm

[Bill Wendling]

Author: void
Date: Sun Feb  8 20:21:05 2009
New Revision: 64109

URL: http://llvm.org/viewvc/llvm-project?rev=64109&view=rev
Log:
Pull r64107 into Dib:

Remove warnings about not being able to delete something. Don't run lipo on
gccas, gccld, and llvm-config scripts.


Modified:
    llvm/branches/Apple/Dib/utils/buildit/build_llvm

Modified: llvm/branches/Apple/Dib/utils/buildit/build_llvm
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Dib/utils/buildit/build_llvm?rev=64109&r1=64108&r2=64109&view=diff

==============================================================================
--- llvm/branches/Apple/Dib/utils/buildit/build_llvm (original)
+++ llvm/branches/Apple/Dib/utils/buildit/build_llvm Sun Feb  8 20:21:05 2009
@@ -184,16 +184,19 @@
 
 # Remove .dir files 
 cd $DEST_DIR$DEST_ROOT
-rm bin/.dir etc/llvm/.dir lib/.dir
+rm -f bin/.dir etc/llvm/.dir lib/.dir
 
 # Remove PPC64 fat slices.
 cd $DEST_DIR$DEST_ROOT/bin
 if [ $MACOSX_DEPLOYMENT_TARGET = "10.4" ]; then
-    find . -perm 755 -type f -exec lipo -extract ppc -extract i386 {} -output {} \;
+    find . -perm 755 -type f \! \( -name '*gccas' -o -name '*gccld' -o -name llvm-config \) \
+        -exec lipo -extract ppc -extract i386 {} -output {} \;
 elif [ $MACOSX_DEPLOYMENT_TARGET = "10.5" ]; then
-    find . -perm 755 -type f -exec lipo -extract ppc7400 -extract i386 {} -output {} \;
+    find . -perm 755 -type f \! \( -name '*gccas' -o -name '*gccld' -o -name llvm-config \) \
+        -exec lipo -extract ppc7400 -extract i386 {} -output {} \;
 else
-    find . -perm 755 -type f -exec lipo -extract ppc7400 -extract i386 -extract x86_64 {} -output {} \;
+    find . -perm 755 -type f \! \( -name '*gccas' -o -name '*gccld' -o -name llvm-config \) \
+        -exec lipo -extract ppc7400 -extract i386 -extract x86_64 {} -output {} \;
 fi
 
 cd $DEST_DIR$DEST_ROOT