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 | c0bb79555cf93270062cbecd1ebb83777fcc0611 (patch) | |
| tree | 88b617be0973538c73418cfc45b989b1484aa9e8 | |
| parent | 8c8ce63d337e58121dd7b9c94ae36b2d9dc9a3ee (diff) | |
| download | master-187ad058-c0bb79555cf93270062cbecd1ebb83777fcc0611.tar.gz master-187ad058-c0bb79555cf93270062cbecd1ebb83777fcc0611.tar.bz2 master-187ad058-c0bb79555cf93270062cbecd1ebb83777fcc0611.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>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45119 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -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)" \ |