From: Peter Korsgaard Date: Thu, 11 Oct 2012 13:35:27 +0000 (+0200) Subject: mtd: fixup after CPPFLAGS addition X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=6e280b75341cd616970ce5559a7725201f6c0c53;p=buildroot.git mtd: fixup after CPPFLAGS addition Fixes http://autobuild.buildroot.net/results/c55e4c9741109c66f8f66ab7e3f4f1664826056a mtd appends to CFLAGS/CPPFLAGS, but doesn't use override - So we need to pass flags in the environment and not on the make command line to get the combination of our flags and mtd's. At the same time cleanup the host build to use a similar form (HOST_CONFIGURE_OPTS) as target build. Signed-off-by: Peter Korsgaard --- diff --git a/package/mtd/mtd.mk b/package/mtd/mtd.mk index 7e3a9b8866..aef478f8df 100644 --- a/package/mtd/mtd.mk +++ b/package/mtd/mtd.mk @@ -20,9 +20,8 @@ endif HOST_MTD_DEPENDENCIES = host-zlib host-lzo host-e2fsprogs define HOST_MTD_BUILD_CMDS - CC="$(HOSTCC)" CFLAGS="$(HOST_CFLAGS)" LDFLAGS="$(HOST_LDFLAGS)" \ - CROSS= $(MAKE1) BUILDDIR=$(@D) \ - WITHOUT_XATTR=1 -C $(@D) + $(HOST_CONFIGURE_OPTS) $(MAKE1) \ + CROSS= BUILDDIR=$(@D) WITHOUT_XATTR=1 -C $(@D) endef define HOST_MTD_INSTALL_CMDS @@ -75,7 +74,7 @@ MTD_TARGETS_y += $(addprefix ubi-utils/,$(MTD_TARGETS_UBI_y)) ifneq ($(MTD_TARGETS_y),) define MTD_BUILD_CMDS - $(MAKE1) $(TARGET_CONFIGURE_OPTS) CROSS=$(TARGET_CROSS) \ + $(TARGET_CONFIGURE_OPTS) $(MAKE1) CROSS=$(TARGET_CROSS) \ BUILDDIR=$(@D) WITHOUT_XATTR=1 WITHOUT_LARGEFILE=1 -C $(@D) \ $(addprefix $(@D)/,$(MTD_TARGETS_y)) endef