OSDN Git Service

Android.mk: fix compiling warnings about gcc
authorChih-Wei Huang <cwhuang@linux.org.tw>
Thu, 18 Mar 2010 06:20:55 +0000 (14:20 +0800)
committerSteve Kondik <shade@chemlab.org>
Wed, 24 Mar 2010 16:47:12 +0000 (12:47 -0400)
Android.mk

index 8a6ac8f..5dc3d31 100644 (file)
@@ -1,9 +1,10 @@
 LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 
+SUBMAKE := make -s -C $(LOCAL_PATH) CC=$(CC)
 KERNEL_MODULES_DIR?=/system/modules/lib/modules
 
-LOCAL_SRC_FILES := $(shell make -s -C $(LOCAL_PATH) show-sources) \
+LOCAL_SRC_FILES := $(shell $(SUBMAKE) show-sources) \
        ../clearsilver/util/regex/regex.c \
        libbb/android.c
 
@@ -21,7 +22,7 @@ LOCAL_CFLAGS := \
        -DANDROID_CHANGES \
        -include include/autoconf.h \
        -D'CONFIG_DEFAULT_MODULES_DIR="$(KERNEL_MODULES_DIR)"' \
-       -D'BB_VER="$(strip $(shell make -s -C $(LOCAL_PATH) kernelversion))"' -DBB_BT=AUTOCONF_TIMESTAMP
+       -D'BB_VER="$(strip $(shell $(SUBMAKE) kernelversion))"' -DBB_BT=AUTOCONF_TIMESTAMP
 
 LOCAL_MODULE := busybox
 LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES)
@@ -65,7 +66,7 @@ include $(CLEAR_VARS)
 
 KERNEL_MODULES_DIR?=/system/modules/lib/modules
 
-LOCAL_SRC_FILES := $(shell make -s -C $(LOCAL_PATH) show-sources) \
+LOCAL_SRC_FILES := $(shell $(SUBMAKE) show-sources) \
        libbb/android.c
 
 LOCAL_C_INCLUDES := \
@@ -84,7 +85,7 @@ LOCAL_CFLAGS := \
        -include sys/cdefs.h \
        -include stdio.h \
        -D'CONFIG_DEFAULT_MODULES_DIR="$(KERNEL_MODULES_DIR)"' \
-       -D'BB_VER="$(strip $(shell make -s -C $(LOCAL_PATH) kernelversion))"' -DBB_BT=AUTOCONF_TIMESTAMP
+       -D'BB_VER="$(strip $(shell $(SUBMAKE) kernelversion))"' -DBB_BT=AUTOCONF_TIMESTAMP
 
 LOCAL_CFLAGS += \
   -Dgetmntent=busybox_getmntent \