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

[Bill Wendling]

Author: void
Date: Tue Feb 26 18:20:27 2008
New Revision: 47647

URL: http://llvm.org/viewvc/llvm-project?rev=47647&view=rev
Log:
We should install the "cpp" program as well. Some projects rely upon it. Name it
"llvm-cpp-4.2" for consistency.

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=47647&r1=47646&r2=47647&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/build_gcc (original)
+++ llvm-gcc-4.2/trunk/build_gcc Tue Feb 26 18:20:27 2008
@@ -355,12 +355,9 @@
 
 # bin
 # The native drivers ('native' is different in different architectures).
-BIN_FILES=`ls $DIR/dst-$BUILD-$BUILD$DEST_ROOT/bin | grep '^[^-]*-[0-9.]*$' \
-  | grep -v gccbug | grep -v gcov || exit 1`
 mkdir .$DEST_ROOT/bin
-for f in $BIN_FILES ; do
-  lipo -output .$DEST_ROOT/bin/$f -create $DIR/dst-*$DEST_ROOT/bin/$f || exit 1
-done
+lipo -output .$DEST_ROOT/bin/llvm-cpp-$MAJ_VERS -create $DIR/dst-*$DEST_ROOT/bin/{llvm-cpp,cpp-$MAJ_VERS} || 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.
 TARG0=`echo $TARGETS | cut -d ' ' -f 1`
@@ -524,6 +521,7 @@
 cd $DEST_DIR$LLVM_BIN_DIR
 ln -s -f ../llvm-gcc-$MAJ_VERS/bin/llvm-gcc-$MAJ_VERS llvm-gcc-$MAJ_VERS || exit 1
 ln -s -f ../llvm-gcc-$MAJ_VERS/bin/llvm-g++-$MAJ_VERS llvm-g++-$MAJ_VERS || exit 1
+ln -s -f ../llvm-gcc-$MAJ_VERS/bin/llvm-cpp-$MAJ_VERS llvm-cpp-$MAJ_VERS || exit 1
 
 # FIXME: This is a hack to get things working.
 for h in $HOSTS ; do