Changeset fa66f4e

Timestamp:

Dec 6, 2016, 4:27:20 PM (8 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

5c81105, fef8293

Parents:

d9c44c3

Message:

Jenkins now properly uses automake cross compilation flag --host=...

File:

• Jenkinsfile (modified) (2 diffs)

Jenkinsfile

@@ -23 +23 @@
                 //escapes the sandbox
                 //Also specify the compiler by hand
-                sh "./configure CXX=${currentCC.cpp_cc} CXXFLAGS=${flags} CFAFLAGS=${flags} --with-backend-compiler=${currentCC.cfa_backend_cc} --prefix=${install_dir} --enable-silent-rules --quiet"
+                sh "./configure CXX=${currentCC.cpp_cc} ${flags} --with-backend-compiler=${currentCC.cfa_backend_cc} --prefix=${install_dir} --enable-silent-rules --quiet"
 
                 //Compile the project
@@ -166 +166 @@
 
                                 bIsFullBuild = isFullBuild == 'true'
-                                architectureFlag = buildArchitecture == '64-bit' ? '-m64' : (buildArchitecture == '32-bit' ? '-m32' : 'ERROR')
+                                architectureFlag = '' 
+                                if (buildArchitecture == '64-bit') {
+                                        architectureFlag = '--host=x86_64 CXXFLAGS="-m64" CFAFLAGS="-m64"' 
+                                } else if (buildArchitecture == '32-bit'){
+                                        architectureFlag = '--host=i386 CXXFLAGS="-m32" CFAFLAGS="-m32"'
+                                } else {
+                                        architectureFlag = 'ERROR'
+                                }
 
                                 echo "FULL BUILD = ${isFullBuild}\nArchitecture = ${buildArchitecture} (flag ${architectureFlag})"