diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2015-03-29 05:12:58 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2015-03-29 05:12:58 +0000 |
| commit | a5422864f57e1e944acca71880b065a46b35e97e (patch) | |
| tree | cbe197b2eff0b4a6c899ec2eb9ad6bdc19078a7f /include | |
| parent | 375337266df72ae3afd97984ccc542b9e386f668 (diff) | |
| download | upstream-a5422864f57e1e944acca71880b065a46b35e97e.tar.gz upstream-a5422864f57e1e944acca71880b065a46b35e97e.tar.bz2 upstream-a5422864f57e1e944acca71880b065a46b35e97e.zip | |
build: fix CMake assembly builds with ccache
CMAKE_ASM_COMPILER is automatically set to CMAKE_C_COMPILER by CMake, but
CMAKE_C_COMPILER_ARG1 is lost. This causes assembly builds to fail when ccache
is enabled (for example the package fastd on x86).
Fix this by explicitly defining CMAKE_ASM_COMPILER and CMAKE_ASM_COMPILER_ARG1.
Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
SVN-Revision: 45119
Diffstat (limited to 'include')
| -rw-r--r-- | include/cmake.mk | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/cmake.mk b/include/cmake.mk index c1fd7d9e51..49fba26278 100644 --- a/include/cmake.mk +++ b/include/cmake.mk @@ -49,6 +49,8 @@ define Build/Configure/Default -DCMAKE_C_COMPILER_ARG1="$(CMAKE_C_COMPILER_ARG1)" \ -DCMAKE_CXX_COMPILER="$(CMAKE_CXX_COMPILER)" \ -DCMAKE_CXX_COMPILER_ARG1="$(CMAKE_CXX_COMPILER_ARG1)" \ + -DCMAKE_ASM_COMPILER="$(CMAKE_C_COMPILER)" \ + -DCMAKE_ASM_COMPILER_ARG1="$(CMAKE_C_COMPILER_ARG1)" \ -DCMAKE_EXE_LINKER_FLAGS:STRING="$(TARGET_LDFLAGS)" \ -DCMAKE_MODULE_LINKER_FLAGS:STRING="$(TARGET_LDFLAGS)" \ -DCMAKE_SHARED_LINKER_FLAGS:STRING="$(TARGET_LDFLAGS)" \ |