@@ -267,8 +267,8 @@ opt mingw-cross 0 "cross-compile for win32 using mingw"
267
267
opt clang 0 " prefer clang to gcc for building the runtime"
268
268
valopt prefix " /usr/local" " set installation prefix"
269
269
valopt llvm-root " " " set LLVM root"
270
- valopt host-triple " $DEFAULT_HOST_TRIPLE " " primary LLVM host triple"
271
- valopt target-triples " " " LLVM target triples (defaults to host if unset) "
270
+ valopt host-triple " ${ DEFAULT_HOST_TRIPLE} " " LLVM host triple"
271
+ valopt target-triples " ${CFG_HOST_TRIPLE} " " LLVM target triples"
272
272
273
273
if [ $HELP -eq 1 ]
274
274
then
@@ -356,23 +356,10 @@ else
356
356
CFG_C_COMPILER=" gcc"
357
357
fi
358
358
359
- if [ -z " $CFG_PREFIX " ]
360
- then
361
- CFG_PREFIX=/usr/local
362
- fi
363
-
364
- if [ -z " $CFG_HOST_TRIPLE " ]
365
- then
366
- CFG_HOST_TRIPLE=" $DEFAULT_HOST_TRIPLE "
367
- fi
368
-
369
- if [ -z " $CFG_TARGET_TRIPLES " ]
370
- then
371
- CFG_TARGET_TRIPLES=" ${CFG_HOST_TRIPLE} "
372
- else
373
- CFG_TARGET_TRIPLES=" $( echo $CFG_TARGET_TRIPLES | tr ' ,' ' ' ) "
374
- fi
359
+ # a little post-processing of various config values
375
360
361
+ CFG_PREFIX=${CFG_PREFIX%/ }
362
+ CFG_TARGET_TRIPLES=" $( echo $CFG_TARGET_TRIPLES | tr ' ,' ' ' ) "
376
363
case $CFG_TARGET_TRIPLES in
377
364
(* $CFG_HOST_TRIPLE * ) ;;
378
365
(* ) err " Host triple is not among the target triples." ;;
@@ -628,10 +615,9 @@ putvar CFG_BUILD_DIR
628
615
putvar CFG_OSTYPE
629
616
putvar CFG_CPUTYPE
630
617
putvar CFG_CONFIGURE_ARGS
631
- putvar CFG_HOST_TRIPLE
618
+ putvar CFG_PREFIX
632
619
putvar CFG_TARGET_TRIPLES
633
620
putvar CFG_C_COMPILER
634
- putvar CFG_PREFIX
635
621
putvar CFG_LIBDIR
636
622
637
623
# Setting this again because it may have been changed
0 commit comments