diff options
author | Chris Lattner <sabre@nondot.org> | 2007-10-24 04:35:54 +0000 |
---|---|---|
committer | Chris Lattner <sabre@nondot.org> | 2007-10-24 04:35:54 +0000 |
commit | 1307cf25ad72b829ebc86811b56769ec0378de8e (patch) | |
tree | c8f48e4d5e4a0810b731ec5665e74f8566ba3612 /tools | |
parent | 917becb3b990bb174c396981eff635a377f5c621 (diff) | |
download | external_llvm-1307cf25ad72b829ebc86811b56769ec0378de8e.zip external_llvm-1307cf25ad72b829ebc86811b56769ec0378de8e.tar.gz external_llvm-1307cf25ad72b829ebc86811b56769ec0378de8e.tar.bz2 |
Fix PR1739.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@43286 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'tools')
-rw-r--r-- | tools/llvm-config/llvm-config.in.in | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/tools/llvm-config/llvm-config.in.in b/tools/llvm-config/llvm-config.in.in index f5368d3..412d252 100644 --- 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 =~ /^(.*)\/.*$/); +# 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`; +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 = `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"; @@ -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") { - $has_opt = 1; print `cd $LLVM_OBJ_ROOT/; pwd`; + $has_opt = 1; print `cd $LLVM_OBJ_ROOT/; $PWD`; } 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(); } |