[llvm-commits] [llvm] r58719 - /llvm/trunk/tools/llvm-config/llvm-config.in.in

[Tanya Lattner]

Author: tbrethou
Date: Tue Nov  4 15:06:11 2008
New Revision: 58719

URL: http://llvm.org/viewvc/llvm-project?rev=58719&view=rev
Log:
Revert 58687. This breaks mingw.

Modified:
    llvm/trunk/tools/llvm-config/llvm-config.in.in

Modified: llvm/trunk/tools/llvm-config/llvm-config.in.in
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-config/llvm-config.in.in?rev=58719&r1=58718&r2=58719&view=diff

==============================================================================
--- llvm/trunk/tools/llvm-config/llvm-config.in.in (original)
+++ llvm/trunk/tools/llvm-config/llvm-config.in.in Tue Nov  4 15:06:11 2008
@@ -18,7 +18,6 @@
 use 5.006;
 use strict;
 use warnings;
-use Cwd;
 
 #---- begin autoconf values ----
 my $PACKAGE_NAME        = q{@PACKAGE_NAME@};
@@ -65,13 +64,21 @@
 # Convert the current executable name into its directory (e.g. ".").
 my ($RUN_DIR) = ($0 =~ /^(.*)\/.*$/);
 
+# Find the unix pwd program: we don't want to use the bash builtin, as it does
+# not look through symlinks etc.
+my $PWD = `which pwd`;
+chomp($PWD);
+$PWD = "pwd" if (!-e $PWD);
+
 # Turn the directory into an absolute directory on the file system, also pop up
 # from "bin" into the build or prefix dir.
-my $ABS_RUN_DIR = Cwd::realpath("$RUN_DIR/..");
+my $ABS_RUN_DIR = `cd $RUN_DIR/..; $PWD`;
+chomp($ABS_RUN_DIR);
 
 # Compute the absolute object directory build, e.g. "foo/llvm/Debug".
 my $ABS_OBJ_ROOT = "$LLVM_OBJ_ROOT/$LLVM_BUILDMODE";
-$ABS_OBJ_ROOT = Cwd::realpath($ABS_OBJ_ROOT) if (-d $ABS_OBJ_ROOT);
+$ABS_OBJ_ROOT = `cd $ABS_OBJ_ROOT; $PWD` if (-d $ABS_OBJ_ROOT);
+chomp($ABS_OBJ_ROOT);
 
 my $INCLUDEDIR = "$ABS_RUN_DIR/include";
 my $LIBDIR     = "$ABS_RUN_DIR/lib";
@@ -135,9 +142,9 @@
         } elsif ($arg eq "--build-mode") {
             $has_opt = 1; print "$LLVM_BUILDMODE\n";
         } elsif ($arg eq "--obj-root") {
-            $has_opt = 1; print Cwd::realpath($LLVM_OBJ_ROOT), "\n";
+            $has_opt = 1; print `cd $LLVM_OBJ_ROOT/; $PWD`;
         } elsif ($arg eq "--src-root") {
-            $has_opt = 1; print Cwd::realpath($LLVM_SRC_ROOT), "\n";
+            $has_opt = 1; print `cd $LLVM_SRC_ROOT/; $PWD`;
         } else {
             usage();
         }