Changes in Jenkinsfile [cc640aad:9b967914]

File:

• Jenkinsfile (modified) (3 diffs)

Jenkinsfile

@@ -23 +23 @@
                 //escapes the sandbox
                 //Also specify the compiler by hand
-                sh "./configure CXX=${currentCC.cpp_cc} ${flags} --with-backend-compiler=${currentCC.cfa_backend_cc} --prefix=${install_dir} --enable-silent-rules --quiet"
+                sh "./configure CXX=${currentCC.cpp_cc} CXXFLAGS=${flags} CFAFLAGS=${flags} --with-backend-compiler=${currentCC.cfa_backend_cc} --prefix=${install_dir} --enable-silent-rules --quiet"
 
                 //Compile the project
@@ -33 +33 @@
                 dir ('src/tests') {
                         if (full_build) {
-                                sh 'make all-tests debug=yes'
-                                sh 'make all-tests debug=no'
+                                sh 'make all-tests'
                         }
                         else {
@@ -167 +166 @@
 
                                 bIsFullBuild = isFullBuild == 'true'
-                                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'
-                                }
+                                architectureFlag = buildArchitecture == '64-bit' ? '-m64' : (buildArchitecture == '32-bit' ? '-m32' : 'ERROR')
 
                                 echo "FULL BUILD = ${isFullBuild}\nArchitecture = ${buildArchitecture} (flag ${architectureFlag})"