Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions dev/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,9 @@ RUN echo "source /home/dev/scripts/alias.sh" >> ~/.bashrc
RUN ln -sf /usr/lib/linux-tools-*/* /usr/bin/

# Install cross compiler
RUN wget -qO- https://developer.arm.com/-/media/Files/downloads/gnu/11.3.rel1/binrel/arm-gnu-toolchain-11.3.rel1-x86_64-arm-none-eabi.tar.xz | tar -xJv
RUN wget -qO- https://developer.arm.com/-/media/Files/downloads/gnu/15.2.rel1/binrel/arm-gnu-toolchain-15.2.rel1-x86_64-arm-none-eabi.tar.xz | tar -xJv

ENV PATH $PATH:/home/dev/arm-gnu-toolchain-11.3.rel1-x86_64-arm-none-eabi/bin
ENV PATH $PATH:/home/dev/arm-gnu-toolchain-15.2.rel1-x86_64-arm-none-eabi/bin

# build and install customized openocd
RUN apt-get install -y libtool libusb-1.0.0-dev
Expand Down
8 changes: 4 additions & 4 deletions ner_environment/build_system/build_system.py
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,8 @@ def build(profile: str = typer.Option(None, "--profile", "-p", callback=unsuppor
else:
run_command_docker(f"make -j{os.cpu_count()}", stream_output=True)

if not clean:
fix_compile_commands()
# if not clean:
# fix_compile_commands()

# ==============================================================================
# Clang command
Expand Down Expand Up @@ -353,9 +353,9 @@ def fix_compile_commands():
os_type = platform.system()
toolchain_name = ""
if os_type == "Linux":
toolchain_name = "arm-gnu-toolchain-14.3.rel1-x86_64-arm-none-eabi"
toolchain_name = "arm-gnu-toolchain-15.2.rel1-x86_64-arm-none-eabi"
else:
toolchain_name = "arm-gnu-toolchain-14.3.rel1-darwin-arm64-arm-none-eabi"
toolchain_name = "arm-gnu-toolchain-15.2.rel1-darwin-arm64-arm-none-eabi"

toolchain_name_ext = toolchain_name + ".tar.xz"

Expand Down