From f99949d911f60ea54dfa74a46762f874f9ba29eb Mon Sep 17 00:00:00 2001 From: "Christopher N. Hesse" Date: Mon, 2 Nov 2015 20:26:17 +0100 Subject: [PATCH] busybox: Compile with actual host GCC on Darwin Change-Id: I26818d5d7cedea1ef181ed83a3e03eff0e316ae6 --- Android.mk | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/Android.mk b/Android.mk index 6d55d993a..d83d7c007 100644 --- a/Android.mk +++ b/Android.mk @@ -33,12 +33,6 @@ include $(CLEAR_VARS) BUSYBOX_CROSS_COMPILER_PREFIX := $(abspath $(TARGET_TOOLS_PREFIX)) -BB_PREPARE_FLAGS:= -ifeq ($(HOST_OS),darwin) - BB_HOSTCC := $(ANDROID_BUILD_TOP)/prebuilts/gcc/darwin-x86/host/i686-apple-darwin-4.2.1/bin/i686-apple-darwin11-gcc - BB_PREPARE_FLAGS := HOSTCC=$(BB_HOSTCC) -endif - # On aosp (master), path is relative, not on cm (kitkat) bb_gen := $(abspath $(TARGET_OUT_INTERMEDIATES)/busybox) @@ -49,7 +43,7 @@ $(busybox_prepare_full): $(BB_PATH)/busybox-full.config @rm -f $(shell find $(abspath $(call intermediates-dir-for,EXECUTABLES,busybox)) -name "*.o") @mkdir -p $(@D) @cat $^ > $@ && echo "CONFIG_CROSS_COMPILER_PREFIX=\"$(BUSYBOX_CROSS_COMPILER_PREFIX)\"" >> $@ - +make -C $(BB_PATH) prepare O=$(@D) $(BB_PREPARE_FLAGS) + +make -C $(BB_PATH) prepare O=$(@D) busybox_prepare_minimal := $(bb_gen)/minimal/.config $(busybox_prepare_minimal): $(BB_PATH)/busybox-minimal.config @@ -58,7 +52,7 @@ $(busybox_prepare_minimal): $(BB_PATH)/busybox-minimal.config @rm -f $(shell find $(abspath $(call intermediates-dir-for,STATIC_LIBRARIES,libbusybox)) -name "*.o") @mkdir -p $(@D) @cat $^ > $@ && echo "CONFIG_CROSS_COMPILER_PREFIX=\"$(BUSYBOX_CROSS_COMPILER_PREFIX)\"" >> $@ - +make -C $(BB_PATH) prepare O=$(@D) $(BB_PREPARE_FLAGS) + +make -C $(BB_PATH) prepare O=$(@D) #####################################################################