[llvm-commits] [llvm-gcc-4.2] r44667 - in /llvm-gcc-4.2/trunk: build_gcc driverdriver.c

[Bill Wendling]

Author: void
Date: Thu Dec  6 16:10:02 2007
New Revision: 44667

URL: http://llvm.org/viewvc/llvm-project?rev=44667&view=rev
Log:
Hacked to link the drivers into the ${Fnord}/Developer/usr/bin directory. This
isn't optimal, but gets around the hack we had of trying to find the correct
driver...


Modified:
    llvm-gcc-4.2/trunk/build_gcc
    llvm-gcc-4.2/trunk/driverdriver.c

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

==============================================================================
--- llvm-gcc-4.2/trunk/build_gcc (original)
+++ llvm-gcc-4.2/trunk/build_gcc Thu Dec  6 16:10:02 2007
@@ -372,7 +372,7 @@
     $DIR/dst-*-$t/$DEST_ROOT/bin/$t-apple-darwin$DARWIN_VERS-gcc || exit 1
 # APPLE LOCAL LLVM build_gcc bug with non-/usr $DEST_ROOT
   lipo -output .$DEST_ROOT/bin/$t-apple-darwin$DARWIN_VERS-llvm-g++-$MAJ_VERS -create \
-    $DIR/dst-*-$t/$DEST_ROOT/bin/$t-apple-darwin$DARWIN_VERS-llvm-g++ || exit 1
+    $DIR/dst-*-$t/$DEST_ROOT/bin/$t-apple-darwin$DARWIN_VERS-g++ || exit 1
 done
 
 # lib
@@ -524,11 +524,17 @@
 ln -s -f ../../../$DEST_ROOT/bin/llvm-gcc-$MAJ_VERS llvm-gcc-$MAJ_VERS || exit 1
 ln -s -f ../../../$DEST_ROOT/bin/llvm-g++-$MAJ_VERS llvm-g++-$MAJ_VERS || exit 1
 
-  # Copy one of the libllvmgcc.dylib's up to libexec/gcc.
+# FIXME: This is a hack to get things working.
+for h in $HOSTS ; do
+    ln -s -f ../../../$DEST_ROOT/bin/$h-apple-darwin$DARWIN_VERS-llvm-gcc-$MAJ_VERS $h-apple-darwin$DARWIN_VERS-llvm-gcc-$MAJ_VERS || exit 1
+    ln -s -f ../../../$DEST_ROOT/bin/$h-apple-darwin$DARWIN_VERS-llvm-g++-$MAJ_VERS $h-apple-darwin$DARWIN_VERS-llvm-g++-$MAJ_VERS || exit 1
+done
+
+# Copy one of the libllvmgcc.dylib's up to libexec/gcc.
 cp $DEST_DIR/$DEST_ROOT/libexec/gcc/$BUILD-apple-darwin$DARWIN_VERS/$VERS/libllvmgcc.dylib \
     $DEST_DIR/$DEST_ROOT/libexec/gcc/
 
-  # Replace the installed ones with symlinks to the common one.
+# Replace the installed ones with symlinks to the common one.
 for t in $TARGETS ; do
     cd $DEST_DIR/$DEST_ROOT/libexec/gcc/$t-apple-darwin$DARWIN_VERS/$VERS/
     rm libllvmgcc.dylib

Modified: llvm-gcc-4.2/trunk/driverdriver.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/driverdriver.c?rev=44667&r1=44666&r2=44667&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/driverdriver.c (original)
+++ llvm-gcc-4.2/trunk/driverdriver.c Thu Dec  6 16:10:02 2007
@@ -1253,6 +1253,7 @@
   strncpy (curr_dir, argv[0], prefix_len);
   curr_dir[prefix_len] = '\0';
   /* LLVM LOCAL begin - These drivers live in /.../usr/llvm-gcc-4.2/bin */
+#if 0
   {
     size_t curr_dir_len = strlen (curr_dir);
     const char *llvm_bin_dir = "/usr/llvm-gcc-4.2/bin/";
@@ -1267,6 +1268,9 @@
     } else
       driver_exec_prefix = curr_dir;
   }
+#else
+  driver_exec_prefix = curr_dir;
+#endif
   /* LLVM LOCAL end - These drivers live in /.../usr/llvm-gcc-4.2/bin */
 
 #ifdef DEBUG
@@ -1553,7 +1557,11 @@
 
   final_cleanup ();
   free (curr_dir);
+  /* LLVM LOCAL - begin */
+#if 0
   if (delete_prefix)
     free (driver_exec_prefix);
+#endif
+  /* LLVM LOCAL - end */
   return greatest_status;
 }