diff options
| -rw-r--r-- | Makefile.toolchain | 7 | ||||
| -rw-r--r-- | cmake/toolchain-armv7m.cmake | 4 |
2 files changed, 0 insertions, 11 deletions
diff --git a/Makefile.toolchain b/Makefile.toolchain index 80896e3e40..12e8440763 100644 --- a/Makefile.toolchain +++ b/Makefile.toolchain @@ -205,13 +205,6 @@ CXXFLAGS=$(CXXFLAGS_WARN) CXXFLAGS+=-DPROTOBUF_INLINE_NOT_IN_HEADERS=0 ifeq ($(USE_BUILTIN_STDLIB), 1) CPPFLAGS+=-DUSE_BUILTIN_STDLIB -else -# TODO(https://issuetracker.google.com/234507656#comment19): C++ include path -# should not be necessary. -CXXFLAGS+=-I/usr/armv7m-cros-eabi/usr/include/c++/v1 -# TODO(https://issuetracker.google.com/254916723): Remove when toolchain is -# fixed. -CPPFLAGS+=-D_GNU_SOURCE endif ifeq ($(LIBFTDI_NAME),) diff --git a/cmake/toolchain-armv7m.cmake b/cmake/toolchain-armv7m.cmake index 641b0debf2..48c2ac18a5 100644 --- a/cmake/toolchain-armv7m.cmake +++ b/cmake/toolchain-armv7m.cmake @@ -23,10 +23,6 @@ add_compile_options(-Oz) add_compile_options(-flto) add_link_options(-flto) -# TODO(b/234507656): Remove this include when clang is fixed. -add_compile_options(-I/usr/armv7m-cros-eabi/usr/include/c++/v1) -# TODO(b/254916723): Remove this define when clang is fixed. -add_compile_options(-D_GNU_SOURCE) add_link_options(-lclang_rt.builtins-armv7m) add_link_options(-lnosys) |