hostapd: fix a race condition related to assoc response tx status processing

[openwrt.git] / include / cmake.mk

diff --git a/include/cmake.mk b/include/cmake.mk
index 09a0a24..fd8ff2d 100644 (file)
--- a/include/cmake.mk
+++ b/include/cmake.mk
@@ -2,6 +2,25 @@ PKG_INSTALL:=1
 
 MAKE_FLAGS+=VERBOSE=1
 
 
 MAKE_FLAGS+=VERBOSE=1
 

+ifeq ($(CONFIG_CCACHE),)
+ ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),)
+  CMAKE_C_COMPILER:=$(TOOLCHAIN_DIR)/bin/$(TARGET_CC)
+  CMAKE_C_COMPILER_ARG1:=
+  CMAKE_CXX_COMPILER:=$(TOOLCHAIN_DIR)/bin/$(TARGET_CXX)
+  CMAKE_CXX_COMPILER_ARG1:=
+ else
+  CMAKE_C_COMPILER:=$(shell which $(TARGET_CC))
+  CMAKE_C_COMPILER_ARG1:=
+  CMAKE_CXX_COMPILER:=$(shell which $(TARGET_CXX))
+  CMAKE_CXX_COMPILER_ARG1:=
+ endif
+else
+  CMAKE_C_COMPILER:=$(STAGING_DIR_HOST)/bin/ccache
+  CMAKE_C_COMPILER_ARG1:=$(filter-out ccache,$(TARGET_CC))
+  CMAKE_CXX_COMPILER:=$(STAGING_DIR_HOST)/bin/ccache
+  CMAKE_CXX_COMPILER_ARG1:=$(filter-out ccache,$(TARGET_CXX))
+endif
+

 define Build/Configure/Default
        (cd $(PKG_BUILD_DIR); \
                CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \
 define Build/Configure/Default
        (cd $(PKG_BUILD_DIR); \
                CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \


@@ -13,8 +32,10 @@ define Build/Configure/Default
                        -DCMAKE_BUILD_TYPE=Release \
                        -DCMAKE_C_FLAGS_RELEASE="-DNDEBUG" \
                        -DCMAKE_CXX_FLAGS_RELEASE="-DNDEBUG" \
                        -DCMAKE_BUILD_TYPE=Release \
                        -DCMAKE_C_FLAGS_RELEASE="-DNDEBUG" \
                        -DCMAKE_CXX_FLAGS_RELEASE="-DNDEBUG" \

-                       -DCMAKE_C_COMPILER=$(TOOLCHAIN_DIR)/bin/$(TARGET_CC) \
-                       -DCMAKE_CXX_COMPILER=$(TOOLCHAIN_DIR)/bin/$(TARGET_CXX) \
+                       -DCMAKE_C_COMPILER="$(CMAKE_C_COMPILER)" \
+                       -DCMAKE_C_COMPILER_ARG1="$(CMAKE_C_COMPILER_ARG1)" \
+                       -DCMAKE_CXX_COMPILER="$(CMAKE_CXX_COMPILER)" \
+                       -DCMAKE_CXX_COMPILER_ARG1="$(CMAKE_CXX_COMPILER_ARG1)" \

                        -DCMAKE_EXE_LINKER_FLAGS="$(TARGET_LDFLAGS)" \
                        -DCMAKE_MODULE_LINKER_FLAGS="$(TARGET_LDFLAGS)" \
                        -DCMAKE_SHARED_LINKER_FLAGS="$(TARGET_LDFLAGS)" \
                        -DCMAKE_EXE_LINKER_FLAGS="$(TARGET_LDFLAGS)" \
                        -DCMAKE_MODULE_LINKER_FLAGS="$(TARGET_LDFLAGS)" \
                        -DCMAKE_SHARED_LINKER_FLAGS="$(TARGET_LDFLAGS)" \


@@ -24,6 +45,7 @@ define Build/Configure/Default
                        -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=$(STAGING_DIR) \
                        -DCMAKE_STRIP=: \
                        -DCMAKE_INSTALL_PREFIX=/usr \
                        -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=$(STAGING_DIR) \
                        -DCMAKE_STRIP=: \
                        -DCMAKE_INSTALL_PREFIX=/usr \

+                       -DDL_LIBRARY=$(STAGING_DIR) \

                        $(CMAKE_OPTIONS) \
                . \
        )
                        $(CMAKE_OPTIONS) \
                . \
        )