Skip to content

Commit

Permalink
Add compile definitions for Experimental Outcome (#34)
Browse files Browse the repository at this point in the history
  • Loading branch information
PatrickKa authored Nov 9, 2023
2 parents 0a31b4c + 971e538 commit 0e38a02
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 4 deletions.
4 changes: 4 additions & 0 deletions full/stm32f411.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,10 @@ set(compile_and_link_options -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=softf
add_compile_options(${compile_and_link_options})
add_compile_options(-gdwarf-2 -mthumb -g3)

# Definitions for Experimental Outcome
add_compile_definitions(SYSTEM_ERROR2_NOT_POSIX)
add_compile_definitions(OUTCOME_DISABLE_EXECINFO)

add_link_options(${compile_and_link_options})
add_link_options(-Wl,-T${linker_script})
add_link_options(
Expand Down
9 changes: 5 additions & 4 deletions linux-x86/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:22.10
FROM ubuntu:23.04

ENV HOME="/"

Expand All @@ -16,6 +16,7 @@ RUN apt-get update -qq && apt-get install -y -qq \
lcov \
make \
ninja-build \
pipx \
python3-pip \
sudo \
vim \
Expand All @@ -34,7 +35,7 @@ RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-12 12
RUN wget https://github.com/Kitware/CMake/releases/download/v3.22.0/cmake-3.22.0-linux-x86_64.tar.gz -q
RUN sudo tar xz -f /cmake-3.22.0-linux-x86_64.tar.gz -C /opt
# Setting PATH for both normal and sudo users
ENV PATH="/opt/cmake-3.22.0-linux-x86_64/bin:$PATH"
ENV PATH="/.local/bin:/opt/cmake-3.22.0-linux-x86_64/bin:$PATH"
RUN echo "Defaults secure_path=\"/opt/cmake-3.22.0-linux-x86_64/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin\"" >> /etc/sudoers
RUN cmake --version
RUN sudo cmake --version
Expand All @@ -57,8 +58,8 @@ RUN GCC_VERSION=$(g++ -dumpfullversion) \
fi

# Install cmake-format and codespell
RUN pip3 install cmake-format
RUN pip3 install codespell
RUN pipx install cmakelang # contains cmake-format
RUN pipx install codespell

# Enable tab completion for git
RUN echo 'source /usr/share/bash-completion/completions/git' >> /.bashrc
Expand Down

0 comments on commit 0e38a02

Please sign in to comment.