Skip to content

Commit

Permalink
Configuration.mk: treat newlib and libcpp as system includes
Browse files Browse the repository at this point in the history
  • Loading branch information
lschuermann committed Jan 17, 2024
1 parent 22f8a73 commit 27b5991
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions Configuration.mk
Original file line number Diff line number Diff line change
Expand Up @@ -291,9 +291,9 @@ override CFLAGS_rv32imac += $(CFLAGS_rv32)
# Set the base `CPPFLAGS` for all RISC-V variants based on the toolchain family.
override CPPFLAGS_rv32 += \
$(CPPFLAGS_toolchain_rv32) \
-I$(NEWLIB_BASE_DIR_rv32)/riscv/riscv64-unknown-elf/include \
-I$(LIBCPP_BASE_DIR_rv32)/riscv/riscv64-unknown-elf/include/c++/$(LIBCPP_VERSION_rv32) \
-I$(LIBCPP_BASE_DIR_rv32)/riscv/riscv64-unknown-elf/include/c++/$(LIBCPP_VERSION_rv32)/riscv64-unknown-elf
-isystem $(NEWLIB_BASE_DIR_rv32)/riscv/riscv64-unknown-elf/include \
-isystem $(LIBCPP_BASE_DIR_rv32)/riscv/riscv64-unknown-elf/include/c++/$(LIBCPP_VERSION_rv32) \
-isystem $(LIBCPP_BASE_DIR_rv32)/riscv/riscv64-unknown-elf/include/c++/$(LIBCPP_VERSION_rv32)/riscv64-unknown-elf

# Set the `CPPFLAGS` for RISC-V. Here we need different flags for different
# variants.
Expand Down Expand Up @@ -423,9 +423,9 @@ override CPPFLAGS_cortex-m += \
-msingle-pic-base\
-mpic-register=r9\
-mno-pic-data-is-text-relative\
-I$(NEWLIB_BASE_DIR_cortex-m)/arm/arm-none-eabi/include\
-I$(LIBCPP_BASE_DIR_cortex-m)/arm/arm-none-eabi/include/c++/$(LIBCPP_VERSION_cortex-m)\
-I$(LIBCPP_BASE_DIR_cortex-m)/arm/arm-none-eabi/include/c++/$(LIBCPP_VERSION_cortex-m)/arm-none-eabi
-isystem $(NEWLIB_BASE_DIR_cortex-m)/arm/arm-none-eabi/include\
-isystem $(LIBCPP_BASE_DIR_cortex-m)/arm/arm-none-eabi/include/c++/$(LIBCPP_VERSION_cortex-m)\
-isystem $(LIBCPP_BASE_DIR_cortex-m)/arm/arm-none-eabi/include/c++/$(LIBCPP_VERSION_cortex-m)/arm-none-eabi

# Work around https://gcc.gnu.org/bugzilla/show_bug.cgi?id=85606
override CPPFLAGS_cortex-m0 += $(CPPFLAGS_cortex-m) \
Expand Down

0 comments on commit 27b5991

Please sign in to comment.