Skip to content

Commit 3d40220

Browse files
fixed Docker build
1 parent a43400b commit 3d40220

File tree

4 files changed

+10
-4
lines changed

4 files changed

+10
-4
lines changed

CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,10 @@ set_target_properties(${CMAKE_PROJECT_NAME} PROPERTIES
3434
CXX_STANDARD_REQUIRED ON
3535
CXX_EXTENSIONS ON
3636
)
37+
38+
target_compile_options(${CMAKE_PROJECT_NAME} PUBLIC -Wall -Wextra -Werror)
39+
40+
3741
# Add lib subdirectory
3842
add_subdirectory(ext)
3943

Dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@ FROM ubuntu:22.04 AS builder
22
LABEL authors="Clemens Elflein"
33

44
RUN apt-get update && apt-get install -y \
5-
gcc-arm-none-eabi \
5+
gcc-arm-none-eabi git \
6+
libasio-dev iproute2 \
7+
python3 python3-venv python3-pip \
68
cmake \
79
make \
810
&& rm -rf /var/lib/apt/lists/*

cmake/gcc-arm-none-eabi.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ add_compile_definitions(CORTEX_USE_FPU=TRUE)
2727
set(TARGET_FLAGS "-mcpu=cortex-m7 -mfpu=fpv5-d16 -mfloat-abi=hard -fomit-frame-pointer -falign-functions=16 -mthumb -fno-common -flto")
2828

2929
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${TARGET_FLAGS}")
30-
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Werror -Wpedantic -fdata-sections -ffunction-sections")
30+
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fdata-sections -ffunction-sections")
3131
if(CMAKE_BUILD_TYPE MATCHES Debug)
3232
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O0 -g3 -DDEBUG_BUILD")
3333
endif()
@@ -36,7 +36,7 @@ if(CMAKE_BUILD_TYPE MATCHES Release)
3636
endif()
3737

3838
set(CMAKE_ASM_FLAGS "${CMAKE_C_FLAGS} -x assembler-with-cpp -MMD -MP")
39-
set(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -fno-rtti -fno-exceptions -fno-threadsafe-statics")
39+
set(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -fno-rtti -fno-exceptions -fno-threadsafe-statics -Wno-volatile")
4040

4141
set(CMAKE_C_LINK_FLAGS "${TARGET_FLAGS}")
4242
set(CMAKE_C_LINK_FLAGS "${CMAKE_C_LINK_FLAGS} --specs=nosys.specs")

ext/xbot_framework

0 commit comments

Comments
 (0)