Always build buildhelpers first (#9299)

diff --git a/build.xml b/build.xml
index da702b863c4a0925019dbad7811196ddf523d85e..eaa106cde33198cd3c3526b76008b575c84afd81 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -16,12 +16,17 @@
 
        <target name="buildorder" depends="official.build.checks">
                <!-- Find out a good build order -->
-               <ivy:buildlist reference="build-path">
+               <ivy:buildlist reference="ivy.build.path">
                        <fileset dir="." includes="**/build.xml">
                                <exclude name="build.xml" />
                                <exclude name="build/**" />
+                               <exclude name="buildhelpers/**" />
                        </fileset>
                </ivy:buildlist>
+               <path id="build-path">
+                       <path location="buildhelpers/build.xml"/>
+                       <path refid="ivy.build.path" />
+               </path>
        </target>
        <target name="clean" depends="buildorder">
                <subant buildpathref="build-path" target="clean">