Skip to content

Commit bdb889e

Browse files
committed
---
yaml --- r: 6169 b: refs/heads/master c: 81a93ef h: refs/heads/master i: 6167: 8cee295 v: v3
1 parent 9069d64 commit bdb889e

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

[refs]

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
---
2-
refs/heads/master: e7afe11a2a9e1480862bdfc3ead3dbc02938fc0a
2+
refs/heads/master: 81a93eff938003ad026297d589d83289fb5dce3f

trunk/configure

+8-4
Original file line numberDiff line numberDiff line change
@@ -471,11 +471,15 @@ do
471471
export CXXFLAGS
472472
export LDFLAGS
473473

474-
# FIXME: This ends up filling the screen with a bunch of LLVM configuration,
475-
# depriving the user of seeing our configuration info
476474
cd $LLVM_BUILD_DIR
477-
# FIXME: This won't work if CFG_SRC_DIR is absolute
478-
${CFG_BUILD_DIR}/${CFG_LLVM_SRC_DIR}/configure $LLVM_FLAGS
475+
case $CFG_SRC_DIR in
476+
/* | [a-z]:* | [A-Z]:*)
477+
${CFG_LLVM_SRC_DIR}/configure $LLVM_FLAGS
478+
;;
479+
*)
480+
${CFG_BUILD_DIR}/${CFG_LLVM_SRC_DIR}/configure $LLVM_FLAGS
481+
;;
482+
esac
479483
cd $CFG_BUILD_DIR
480484
else
481485
LLVM_BUILD_DIR=

0 commit comments

Comments
 (0)