Skip to content

Commit

Permalink
fu c++ flags
Browse files Browse the repository at this point in the history
  • Loading branch information
Victor Paleologue committed Aug 10, 2021
1 parent 583dcd0 commit a185576
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 8 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/continuous.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ jobs:
runs-on: ubuntu-20.04

env:
CXXFLAGS: -std=c++11 -fPIC
CXXFLAGS: -std=gnu++11
CPPFLAGS: -fPIC

steps:
- name: Update APT
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ jobs:
runs-on: ubuntu-20.04

env:
CXXFLAGS: -std=c++11 -fPIC
CXXFLAGS: -std=gnu++11
CPPFLAGS: -fPIC

steps:
- name: Update APT
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@ RUN apt-get update && apt-get install -y apt-utils ca-certificates locales \
RUN pip3 install --upgrade pip
RUN pip3 install --upgrade cmake

ENV CPPFLAGS "-Wall -std=c++11 -fPIC"
ENV CPPFLAGS "-Wall -std=gnu++11 -fPIC"
WORKDIR /opt/workspace
COPY scripts /opt/scripts
2 changes: 1 addition & 1 deletion scripts/build_all.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash

export CXXFLAGS=" -std=c++11 -fPIC"
export CXXFLAGS=" -std=gnu++11 -fPIC"

cd zlib && bash build.sh && cd ..
cd icu && bash build.sh && cd ..
Expand Down
6 changes: 3 additions & 3 deletions scripts/build_boost.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ function build_and_install()
./bootstrap.sh --with-python-version=3.5 --with-python=$(which python3) --with-icu=${ICU_ROOT} --prefix="${INSTALL_DIR}"
fi

echo "Building Boost with C++ flags: ${CPPFLAGS}"
if [ -n "${CPPFLAGS}" ]; then
./b2 -a cxxflags="${CPPFLAGS}"
echo "Building Boost with C++ flags: ${CXXFLAGS}"
if [ -n "${CXXFLAGS}" ]; then
./b2 -a cxxflags="${CXXFLAGS}"
else
./b2 -a
fi
Expand Down
2 changes: 1 addition & 1 deletion scripts/build_openssl.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ function build_and_install()
./config --prefix=${INSTALL_DIR} --openssldir=${INSTALL_DIR}
fi

echo "Building OpenSSL with C++ flags: ${CPPFLAGS}"
echo "Building OpenSSL with C++ flags: ${CPPFLAGS} ${CXXFLAGS}"
make -j4
sudo make install_sw
}
Expand Down

0 comments on commit a185576

Please sign in to comment.