Skip to content

Commit

Permalink
github bot: remove explicit flags
Browse files Browse the repository at this point in the history
The explicit flags passed to the build system are identical or more
restricitve than the defaults breaking for example builds using clang.

Removing the explicit flags mean we do not have to maintain multiple
sets of compiler flags.

Signed-off-by: Florian Fischer <[email protected]>
  • Loading branch information
fischerling committed Jul 4, 2022
1 parent 34b3e45 commit 9d93f5d
Showing 1 changed file with 4 additions and 7 deletions.
11 changes: 4 additions & 7 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,6 @@ jobs:
cc: mips-linux-gnu-gcc
cxx: mips-linux-gnu-g++

env:
FLAGS: -g -O2 -Wall -Wextra -Werror

steps:
- name: Checkout source
uses: actions/checkout@v2
Expand Down Expand Up @@ -139,21 +136,21 @@ jobs:
run: |
if [[ "${{matrix.arch}}" == "x86_64" ]]; then \
if [[ "${{matrix.cc}}" == "clang" ]]; then \
make CC=${{matrix.cc}} CXX=${{matrix.cxx}} CPPFLAGS="-Werror" CFLAGS="$FLAGS" CXXFLAGS="$FLAGS"; \
make CC=${{matrix.cc}} CXX=${{matrix.cxx}}; \
else \
make CPPFLAGS="-Werror" CFLAGS="$FLAGS" CXXFLAGS="$FLAGS"; \
make;\
fi; \
else \
CPPFLAGS="-Werror" CFLAGS="$FLAGS" CXXFLAGS="$FLAGS" meson build --cross-file /tmp/cross-env.txt; \
meson build --cross-file /tmp/cross-env.txt; \
ninja -C build -j$(nproc); \
fi;
- name: Build nolibc
run: |
if [[ "${{matrix.arch}}" == "x86_64" || "${{matrix.arch}}" == "i686" ]]; then \
make clean; \
CC=${{matrix.cc}} CXX=${{matrix.cxx}} CPPFLAGS="-Werror" CFLAGS="$FLAGS" CXXFLAGS="$FLAGS" meson setup build -Dnolibc=true -Dtests=true -Dexamples=true; \
CC=${{matrix.cc}} CXX=${{matrix.cxx}} meson setup build -Dnolibc=true -Dtests=true -Dexamples=true; \
ninja -C build -j$(nproc); \
else \
echo "Skipping nolibc build, this arch doesn't support building liburing without libc"; \
Expand Down

0 comments on commit 9d93f5d

Please sign in to comment.