[llvm-commits] [llvm-gcc-4.2] r48551 - /llvm-gcc-4.2/trunk/build_gcc

[Bill Wendling]

Author: void
Date: Wed Mar 19 16:36:25 2008
New Revision: 48551

URL: http://llvm.org/viewvc/llvm-project?rev=48551&view=rev
Log:
If building the Apple Way on a single architecture, some of the "cpp"
executables won't be found causing lipo to error. Get a list of them before
calling lipo to avoid the error.

Modified:
    llvm-gcc-4.2/trunk/build_gcc

Modified: llvm-gcc-4.2/trunk/build_gcc
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/build_gcc?rev=48551&r1=48550&r2=48551&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/build_gcc (original)
+++ llvm-gcc-4.2/trunk/build_gcc Wed Mar 19 16:36:25 2008
@@ -367,7 +367,8 @@
 # bin
 # The native drivers ('native' is different in different architectures).
 mkdir .$DEST_ROOT/bin
-lipo -output .$DEST_ROOT/bin/llvm-cpp-$MAJ_VERS -create $DIR/dst-*$DEST_ROOT/bin/{llvm-cpp,cpp-$MAJ_VERS} || exit 1
+cpp_files=`ls $DIR/dst-*$DEST_ROOT/bin/{llvm-cpp,cpp-$MAJ_VERS} 2>/dev/null`
+lipo -output .$DEST_ROOT/bin/llvm-cpp-$MAJ_VERS -create $cpp_files || exit 1
 
 # gcov, which is special only because it gets built multiple times and lipo
 # will complain if we try to add two architectures into the same output.