Always put version numbers at the end because they are optional.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@46563 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/utils/buildit/GNUmakefile b/utils/buildit/GNUmakefile
index 400d97a0c09d338c6e3066e5b9ba74a5a9f9e0a9..f0882ca106ae39cc9c093473fe89a08160162ca0 100644 (file)
--- a/utils/buildit/GNUmakefile
+++ b/utils/buildit/GNUmakefile
@@ -56,12 +56,14 @@ ifndef RC_ProjectSourceSubversion
 RC_ProjectSourceSubversion = 01
 endif
 
+# NOTE : Always put version numbers at the end because they are optional.
 install: $(OBJROOT) $(SYMROOT) $(DSTROOT)
        cd $(OBJROOT) && \
          $(SRC)/build_llvm "$(RC_ARCHS)" "$(TARGETS)" \
            $(SRC) $(PREFIX) $(DSTROOT) $(SYMROOT) \
-           $(RC_ProjectSourceVersion) $(RC_ProjectSourceSubversion) \
-           $(LLVM_ASSERTIONS) $(LLVM_OPTIMIZED)
+           $(LLVM_ASSERTIONS) $(LLVM_OPTIMIZED) \
+           $(RC_ProjectSourceVersion) $(RC_ProjectSourceSubversion) 
+
 
 # installhdrs does nothing, because the headers aren't useful until
 # the compiler is installed.

diff --git a/utils/buildit/build_llvm b/utils/buildit/build_llvm
index 90a2d9603c88367c93daa52bdf26f3417879e9aa..c9598109249b9a0ac86b501fb3c1d926004a93b9 100755 (executable)
--- a/utils/buildit/build_llvm
+++ b/utils/buildit/build_llvm
@@ -34,19 +34,19 @@ DEST_DIR="$5"
 # resulting compiler.
 SYM_DIR="$6"
 
-# The seventh parameter is the version number of the submission, e.g. 1007.
-LLVM_SUBMIT_VERSION="$7"
-
-# The eighth parameter is the subversion number of the submission, e.g. 03.
-LLVM_SUBMIT_SUBVERSION="$8"
-
-# The nineth parameter is a yes/no that indicates whether assertions should be
+# The seventh parameter is a yes/no that indicates whether assertions should be
 # enabled in the LLVM libs/tools.
-LLVM_ASSERTIONS="$9"
+LLVM_ASSERTIONS="$7"
 
-# The tenth parameter is a yes/no that indicates whether this is an optimized
+# The eighth parameter is a yes/no that indicates whether this is an optimized
 # build.
-LLVM_OPTIMIZED="${10}"
+LLVM_OPTIMIZED="$8"
+
+# The nineth parameter is the version number of the submission, e.g. 1007.
+LLVM_SUBMIT_VERSION="$9"
+
+# The tenth parameter is the subversion number of the submission, e.g. 03.
+LLVM_SUBMIT_SUBVERSION="${10}"
 
 # The current working directory is where the build will happen. It may already
 # contain a partial result of an interrupted build, in which case this script