From 29863a348bb037207e300f158a281383ed364bfb Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Thu, 9 Jan 2020 17:35:53 +0000 Subject: [PATCH] CI build script minor fixes --- ci-scripts/install-latan.sh | 2 +- ci-scripts/install-nlopt.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ci-scripts/install-latan.sh b/ci-scripts/install-latan.sh index 6e04c35..6947da6 100755 --- a/ci-scripts/install-latan.sh +++ b/ci-scripts/install-latan.sh @@ -13,6 +13,6 @@ cd .. ./bootstrap.sh mkdir -p build cd build -../configure --prefix=$PREFIX --with-minuit=$PREFIX --with-nlopt=$PREFIX --with-latcore=$PREFIX --with-hdf5=$PREFIX --with-gsl=$PREFIX CXXFLAGS="${CXXFLAGS} -O3 -march=native -mtune=native" +../configure --prefix=$PREFIX --with-minuit=$PREFIX --with-nlopt=$PREFIX --with-hdf5=$PREFIX --with-gsl=$PREFIX CXXFLAGS="${CXXFLAGS} -O3 -march=native -mtune=native" make -j4 make install diff --git a/ci-scripts/install-nlopt.sh b/ci-scripts/install-nlopt.sh index a46f85f..4afbeef 100755 --- a/ci-scripts/install-nlopt.sh +++ b/ci-scripts/install-nlopt.sh @@ -16,10 +16,10 @@ tar -xzvf v${NAME}.tar.gz NAME=nlopt-${NAME} mkdir -p ${NAME}/build cd ${NAME}/build -cmake -DCMAKE_INSTALL_PREFIX=${PREFIX} .. +cmake -DCMAKE_C_COMPILER=${CC} -DCMAKE_CXX_COMPILER=${CXX} -DCMAKE_INSTALL_PREFIX=${PREFIX} .. make -j4 make install -cmake -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX=${PREFIX} .. +cmake -DCMAKE_C_COMPILER=${CC} -DCMAKE_CXX_COMPILER=${CXX} -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX=${PREFIX} .. make -j4 make install cd ${INITDIR}/local