[llvm-commits] [llvm] r43286 - /llvm/trunk/tools/llvm-config/llvm-config.in.in
Chris Lattner
sabre at nondot.org
Tue Oct 23 21:35:55 PDT 2007
Author: lattner
Date: Tue Oct 23 23:35:54 2007
New Revision: 43286
URL: http://llvm.org/viewvc/llvm-project?rev=43286&view=rev
Log:
Fix PR1739.
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=43286&r1=43285&r2=43286&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-config/llvm-config.in.in (original)
+++ llvm/trunk/tools/llvm-config/llvm-config.in.in Tue Oct 23 23:35:54 2007
@@ -64,14 +64,20 @@
# 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 @@
} 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();
}
More information about the llvm-commits
mailing list