Skip to content

Commit

Permalink
[CI] Configure gcc build without hwloc
Browse files Browse the repository at this point in the history
The GCC build uses Ubuntu Xenial which has an older hwloc that does not
work well with docker.

Belonging to [master]:
  - #113
  • Loading branch information
sjoelund authored and OpenModelica-Hudson committed Apr 3, 2019
1 parent eebd629 commit f55d4f1
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions Jenkinsfile
Expand Up @@ -23,7 +23,7 @@ pipeline {
QTDIR = "/usr/lib/qt4"
}
steps {
buildOMC('gcc', 'g++')
buildOMC('gcc', 'g++', '')
stash name: 'omc-gcc', includes: 'build/**, **/config.status'
}
}
Expand All @@ -36,7 +36,7 @@ pipeline {
}
}
steps {
buildOMC('clang', 'clang++')
buildOMC('clang', 'clang++', '--without-hwloc')
stash name: 'omc-clang', includes: 'build/**, **/config.status'
}
}
Expand Down Expand Up @@ -507,11 +507,11 @@ void makeLibsAndCache(libs='core') {
sh "make -j${numLogicalCPU()} --output-sync omlibrary-${libs} ReferenceFiles"
}

void buildOMC(CC, CXX) {
void buildOMC(CC, CXX, extraFlags) {
standardSetup()
sh 'autoconf'
// Note: Do not use -march=native since we might use an incompatible machine in later stages
sh "./configure CC='${CC}' CXX='${CXX}' FC=gfortran CFLAGS=-Os --with-cppruntime --without-omc --without-omlibrary --with-omniORB --enable-modelica3d"
sh "./configure CC='${CC}' CXX='${CXX}' FC=gfortran CFLAGS=-Os --with-cppruntime --without-omc --without-omlibrary --with-omniORB --enable-modelica3d ${extraFlags}"
sh "make -j${numPhysicalCPU()} --output-sync omc omc-diff"
sh 'find build/lib/*/omc/ -name "*.so" -exec strip {} ";"'
}
Expand Down

0 comments on commit f55d4f1

Please sign in to comment.