From e32d58f637b44dc9abe13d1d8da82d975d88c133 Mon Sep 17 00:00:00 2001 From: Tanya Lattner Date: Tue, 4 Nov 2008 21:06:11 +0000 Subject: [PATCH] Revert 58687. This breaks mingw. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@58719 91177308-0d34-0410-b5e6-96231b3b80d8 --- tools/llvm-config/llvm-config.in.in | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/tools/llvm-config/llvm-config.in.in b/tools/llvm-config/llvm-config.in.in index 677fdcb0bfe..36b5112bb67 100644 --- a/tools/llvm-config/llvm-config.in.in +++ b/tools/llvm-config/llvm-config.in.in @@ -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 @@ 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 = 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 @@ 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 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(); } -- 2.34.1