Index: llvm-config.in.in
===================================================================
--- llvm-config.in.in	(revision 58755)
+++ llvm-config.in.in	(working copy)
@@ -18,6 +18,8 @@
 use 5.006;
 use strict;
 use warnings;
+use File::Spec;
+use Cwd;
 
 #---- begin autoconf values ----
 my $PACKAGE_NAME        = q{@PACKAGE_NAME@};
@@ -62,23 +64,17 @@
 # locations of some files.
 
 # Convert the current executable name into its directory (e.g. ".").
-my ($RUN_DIR) = ($0 =~ /^(.*)\/.*$/);
+(my $vol, my $dir) = File::Spec->splitpath($0);
+my $RUN_DIR = File::Spec->catpath($vol, $dir);
+chomp($RUN_DIR);
 
-# 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 = `cd $RUN_DIR/..; $PWD`;
-chomp($ABS_RUN_DIR);
+my $ABS_RUN_DIR = Cwd::realpath("$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 = `cd $ABS_OBJ_ROOT; $PWD` if (-d $ABS_OBJ_ROOT);
-chomp($ABS_OBJ_ROOT);
+$ABS_OBJ_ROOT = Cwd::realpath("$ABS_OBJ_ROOT") if (-d $ABS_OBJ_ROOT);
 
 my $INCLUDEDIR = "$ABS_RUN_DIR/include";
 my $LIBDIR     = "$ABS_RUN_DIR/lib";
@@ -142,9 +138,9 @@
         } elsif ($arg eq "--build-mode") {
             $has_opt = 1; print "$LLVM_BUILDMODE\n";
         } elsif ($arg eq "--obj-root") {
-            $has_opt = 1; print `cd $LLVM_OBJ_ROOT/; $PWD`;
+            $has_opt = 1; print Cwd::realpath($LLVM_OBJ_ROOT), "\n";
         } elsif ($arg eq "--src-root") {
-            $has_opt = 1; print `cd $LLVM_SRC_ROOT/; $PWD`;
+            $has_opt = 1; print Cwd::realpath($LLVM_SRC_ROOT), "\n";
         } else {
             usage();
         }
