[llvm-commits] CVS: llvm/tools/llvm-config/llvm-config.in.in

[Chris Lattner]

Changes in directory llvm/tools/llvm-config:

llvm-config.in.in updated: 1.16 -> 1.17
---
Log message:

Fix a bug in the following scenario.
1. llvm is built with objroot = OBJ and installed.
2. OBJ is deleted or install tree is shipped.
3. llvm-config is run.

In this scenario, llvm-config shouldn't emit an error message at #3, it
should just know it's not running in the objdir :)



---
Diffs of the changes:  (+2 -1)

 llvm-config.in.in |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)


Index: llvm/tools/llvm-config/llvm-config.in.in
diff -u llvm/tools/llvm-config/llvm-config.in.in:1.16 llvm/tools/llvm-config/llvm-config.in.in:1.17
--- llvm/tools/llvm-config/llvm-config.in.in:1.16	Tue Jun  6 17:38:29 2006
+++ llvm/tools/llvm-config/llvm-config.in.in	Tue Jun  6 18:54:15 2006
@@ -63,7 +63,8 @@
 chomp($ABS_RUN_DIR);
 
 # Compute the absolute object directory build, e.g. "foo/llvm/Debug".
-my $ABS_OBJ_ROOT = `cd $LLVM_OBJ_ROOT/$LLVM_BUILDMODE; pwd`;
+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);
 
 my $INCLUDEDIR = "$ABS_RUN_DIR/include";