|
373 | 373 |
|
374 | 374 | # If we have no git directory then we are probably a tarball distribution
|
375 | 375 | # and shouldn't attempt to load submodules
|
376 |
| -if [ ! -e ${CFG_SRC_DIR}.git ] |
| 376 | +if [ ! -e "${CFG_SRC_DIR}.git" ] |
377 | 377 | then
|
378 | 378 | probe CFG_GIT git
|
379 | 379 | msg "git: no git directory. disabling submodules"
|
@@ -634,7 +634,7 @@ step_msg "configuring submodules"
|
634 | 634 | # Have to be in the top of src directory for this
|
635 | 635 | if [ -z $CFG_DISABLE_MANAGE_SUBMODULES ]
|
636 | 636 | then
|
637 |
| - cd ${CFG_SRC_DIR} |
| 637 | + cd "${CFG_SRC_DIR}" |
638 | 638 |
|
639 | 639 | msg "git: submodule sync"
|
640 | 640 | "${CFG_GIT}" submodule --quiet sync
|
@@ -662,28 +662,28 @@ then
|
662 | 662 | "${CFG_GIT}" submodule --quiet foreach --recursive git checkout .
|
663 | 663 | need_ok "git failed"
|
664 | 664 |
|
665 |
| - cd ${CFG_BUILD_DIR} |
| 665 | + cd "${CFG_BUILD_DIR}" |
666 | 666 | fi
|
667 | 667 |
|
668 | 668 | # Configure llvm, only if necessary
|
669 | 669 | step_msg "looking at LLVM"
|
670 |
| -CFG_LLVM_SRC_DIR=${CFG_SRC_DIR}src/llvm/ |
| 670 | +CFG_LLVM_SRC_DIR="${CFG_SRC_DIR}src/llvm/" |
671 | 671 | for t in $CFG_TARGET_TRIPLES
|
672 | 672 | do
|
673 | 673 | do_reconfigure=1
|
674 | 674 |
|
675 |
| - if [ -z $CFG_LLVM_ROOT ] |
| 675 | + if [ -z "$CFG_LLVM_ROOT" ] |
676 | 676 | then
|
677 |
| - LLVM_BUILD_DIR=${CFG_BUILD_DIR}llvm/$t |
| 677 | + LLVM_BUILD_DIR="${CFG_BUILD_DIR}llvm/$t" |
678 | 678 | if [ ! -z "$CFG_DISABLE_OPTIMIZE_LLVM" ]
|
679 | 679 | then
|
680 | 680 | LLVM_DBG_OPTS=""
|
681 | 681 | # Just use LLVM straight from its build directory to
|
682 | 682 | # avoid 'make install' time
|
683 |
| - LLVM_INST_DIR=$LLVM_BUILD_DIR/Debug+Asserts |
| 683 | + LLVM_INST_DIR="$LLVM_BUILD_DIR/Debug+Asserts" |
684 | 684 | else
|
685 | 685 | LLVM_DBG_OPTS="--enable-optimized"
|
686 |
| - LLVM_INST_DIR=$LLVM_BUILD_DIR/Release+Asserts |
| 686 | + LLVM_INST_DIR="$LLVM_BUILD_DIR/Release+Asserts" |
687 | 687 | fi
|
688 | 688 | else
|
689 | 689 | msg "not reconfiguring LLVM, external LLVM root"
|
|
704 | 704 | do
|
705 | 705 | config_status="${CFG_BUILD_DIR}llvm/$t/config.status"
|
706 | 706 | if test -e ${index} -a \
|
707 |
| - -e ${config_status} -a \ |
708 |
| - ${config_status} -nt ${index} |
| 707 | + -e "${config_status}" -a \ |
| 708 | + "${config_status}" -nt ${index} |
709 | 709 | then
|
710 | 710 | msg "not reconfiguring LLVM, config.status is fresh"
|
711 | 711 | do_reconfigure=0
|
|
783 | 783 | export CXXFLAGS
|
784 | 784 | export LDFLAGS
|
785 | 785 |
|
786 |
| - cd $LLVM_BUILD_DIR |
| 786 | + cd "$LLVM_BUILD_DIR" |
787 | 787 | case $CFG_SRC_DIR in
|
788 | 788 | /* | [a-z]:* | [A-Z]:*)
|
789 |
| - ${CFG_LLVM_SRC_DIR}configure $LLVM_FLAGS |
| 789 | + "${CFG_LLVM_SRC_DIR}configure" $LLVM_FLAGS |
790 | 790 | ;;
|
791 | 791 | *)
|
792 |
| - ${CFG_BUILD_DIR}${CFG_LLVM_SRC_DIR}configure \ |
| 792 | + "${CFG_BUILD_DIR}${CFG_LLVM_SRC_DIR}configure" \ |
793 | 793 | $LLVM_FLAGS
|
794 | 794 | ;;
|
795 | 795 | esac
|
796 | 796 | need_ok "LLVM configure failed"
|
797 |
| - cd $CFG_BUILD_DIR |
| 797 | + cd "$CFG_BUILD_DIR" |
798 | 798 | fi
|
799 | 799 |
|
800 | 800 | # Construct variables for LLVM build and install directories for
|
|
0 commit comments