diff options
| author | fuzzard <fuzzard@kodi.tv> | 2021-11-11 19:40:01 +1000 |
|---|---|---|
| committer | fuzzard <fuzzard@kodi.tv> | 2021-11-18 10:52:33 +1000 |
| commit | c98983070c7987de128769397119be2d6218d1de (patch) | |
| tree | abae5aa9ed612b89099baedabd8c62beb341e41b | |
| parent | 50cf13c57a5ddb41e15d8bc4ff4395f80b736b98 (diff) | |
[tools/depends] configure.ac introduce ccache variable
cmake 3.4 introduced CMAKE_CXX_COMPILER_LAUNCHER
flatbuffers cannot handle Compiler set to "ccache compiler". use launcher to enable
ccache usage.
| -rw-r--r-- | tools/depends/Makefile.include.in | 5 | ||||
| -rw-r--r-- | tools/depends/native/flatbuffers/Makefile | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/tools/depends/Makefile.include.in b/tools/depends/Makefile.include.in index cde0b8e396..b06f40ae42 100644 --- a/tools/depends/Makefile.include.in +++ b/tools/depends/Makefile.include.in @@ -78,15 +78,16 @@ ifneq (@use_build_toolchain@,) endif PATH:=@prefix@/@tool_dir@/bin:$(PATH) LD_FOR_BUILD=@LD_FOR_BUILD@ +CC_BINARY_FOR_BUILD=@CC_FOR_BUILD@ +CXX_BINARY_FOR_BUILD=@CXX_FOR_BUILD@ ifneq (@use_ccache@,yes) CC_FOR_BUILD=@CC_FOR_BUILD@ CXX_FOR_BUILD=@CXX_FOR_BUILD@ else CC_FOR_BUILD=@CCACHE@ @CC_FOR_BUILD@ CXX_FOR_BUILD=@CCACHE@ @CXX_FOR_BUILD@ + CCACHE=@CCACHE@ endif -CC_BINARY_FOR_BUILD=@CC_FOR_BUILD@ -CXX_BINARY_FOR_BUILD=@CXX_FOR_BUILD@ AR_FOR_BUILD=@AR_FOR_BUILD@ RANLIB_FOR_BUILD=@RANLIB_FOR_BUILD@ AS_FOR_BUILD=@AS_FOR_BUILD@ diff --git a/tools/depends/native/flatbuffers/Makefile b/tools/depends/native/flatbuffers/Makefile index 1f4196e963..f919f4d183 100644 --- a/tools/depends/native/flatbuffers/Makefile +++ b/tools/depends/native/flatbuffers/Makefile @@ -11,6 +11,10 @@ ARCHIVE=$(SOURCE).tar.gz APP=$(PLATFORM)/build-cmake/flatc +ifeq ($(USE_CCACHE), yes) + LAUNCHER=-DCMAKE_CXX_COMPILER_LAUNCHER=$(CCACHE) +endif + # Only this package uses CMake for build on native at the moment, # so there is no separate toolchain file. Still we have to unset # the CMAKE_TOOLCHAIN_FILE, which is part of $(CMAKE) and set to @@ -27,6 +31,7 @@ CMAKE_OPTIONS := -DCMAKE_TOOLCHAIN_FILE= \ -DFLATBUFFERS_BUILD_SHAREDLIB=OFF \ -DCMAKE_C_COMPILER="$(CC_BINARY_FOR_BUILD)" \ -DCMAKE_CXX_COMPILER="$(CXX_BINARY_FOR_BUILD)" \ + $(LAUNCHER) \ -DCMAKE_C_FLAGS="$(NATIVE_CFLAGS)" \ -DCMAKE_CXX_FLAGS="$(NATIVE_CXXFLAGS)" \ -DCMAKE_EXE_LINKER_FLAGS="$(NATIVE_LDFLAGS)" \ |