Fix PR1739.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@43286 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/tools/llvm-config/llvm-config.in.in b/tools/llvm-config/llvm-config.in.in
index f5368d3668347eae85910936a033256192a556c7..412d2524df00b194df08f3d93f44bcd2e3901bf8 100644 (file)
--- a/tools/llvm-config/llvm-config.in.in
+++ b/tools/llvm-config/llvm-config.in.in
@@ -64,14 +64,20 @@ my $LLVM_BUILDMODE      = q{@LLVM_BUILDMODE@};
 # Convert the current executable name into its directory (e.g. ".").
 my ($RUN_DIR) = ($0 =~ /^(.*)\/.*$/);
 
 # 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.
 # 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`;
+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";
 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 = `cd $ABS_OBJ_ROOT; pwd` 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";
 chomp($ABS_OBJ_ROOT);
 
 my $INCLUDEDIR = "$ABS_RUN_DIR/include";


@@ -136,9 +142,9 @@ foreach my $arg (@ARGV) {
         } elsif ($arg eq "--build-mode") {
             $has_opt = 1; print "$LLVM_BUILDMODE\n";
         } elsif ($arg eq "--obj-root") {
         } 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 `cd $LLVM_OBJ_ROOT/; $PWD`;

         } elsif ($arg eq "--src-root") {
         } elsif ($arg eq "--src-root") {

-            $has_opt = 1; print `cd $LLVM_SRC_ROOT/; pwd`;
+            $has_opt = 1; print `cd $LLVM_SRC_ROOT/; $PWD`;

         } else {
             usage();
         }
         } else {
             usage();
         }