From patchwork Thu Jul 26 03:40:46 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Martin X-Patchwork-Id: 173323 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (silver.osuosl.org [140.211.166.136]) by ozlabs.org (Postfix) with ESMTP id 6C2442C0092 for ; Thu, 26 Jul 2012 13:42:24 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 58EDC32BFC; Thu, 26 Jul 2012 03:42:20 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id cYPCkm7GyJLu; Thu, 26 Jul 2012 03:42:17 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 053B431CAD; Thu, 26 Jul 2012 03:42:17 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 3F63C8F753 for ; Thu, 26 Jul 2012 03:42:15 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 390938F9EA for ; Thu, 26 Jul 2012 03:42:15 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id rfapBlmJ2kV4 for ; Thu, 26 Jul 2012 03:42:14 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wi0-f175.google.com (mail-wi0-f175.google.com [209.85.212.175]) by whitealder.osuosl.org (Postfix) with ESMTPS id E85C68E873 for ; Thu, 26 Jul 2012 03:42:13 +0000 (UTC) Received: by wibhm2 with SMTP id hm2so4462466wib.10 for ; Wed, 25 Jul 2012 20:42:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer; bh=Nhon37eag9QPkiqUQFRujCOPfQ/FEcnuMjNy57kv8XE=; b=YhPZWqwTpir1SZluP8cPPSa5Pgak05K5FKNsQwn5dUyFw4+zSSOwwY2ihZFzPCjeyz +nxaaH5FazzsFYkn/XKZHp+Y8DWjqjXOIkvhO0CQ0G0nPv1ZeRuFNMoA14mKOcRk0qO6 OlwCO6HNyAOQ32fHnH8HxKaXLkN/FrCESOcGTHrWKl4h/et1mA6EzFsUtqO4zYTPFwif Pbh0EyUg3EkNGbszfyNcq6fLTMJxmDx03VQUJm/BJYB8KfmqgA6zGjjl73+hypjRExyd t39iFkPpBH6e8qXfCnYyiZ2Wm4wGp788jFTbFJILgoOq0Sq6eja1B0zwmKQ6aWMp0k+n cX+w== Received: by 10.216.241.200 with SMTP id g50mr13252741wer.79.1343274131878; Wed, 25 Jul 2012 20:42:11 -0700 (PDT) Received: from localhost.localdomain (ivr94-4-82-229-165-48.fbx.proxad.net. [82.229.165.48]) by mx.google.com with ESMTPS id ef5sm9201985wib.3.2012.07.25.20.42.09 (version=SSLv3 cipher=OTHER); Wed, 25 Jul 2012 20:42:10 -0700 (PDT) From: Samuel Martin To: buildroot@busybox.net Date: Thu, 26 Jul 2012 05:40:46 +0200 Message-Id: <1343274046-3825-1-git-send-email-s.martin49@gmail.com> X-Mailer: git-send-email 1.7.11.3 Subject: [Buildroot] [PATCH v2 1/1] Makefile.in: add CPPFLAGS support X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net Signed-off-by: Samuel Martin Acked-by: Arnout Vandecappelle (Essensium/Mind) diff --git a/package/Makefile.in b/package/Makefile.in index 6fad224..d8c545d 100644 --- a/package/Makefile.in +++ b/package/Makefile.in @@ -85,18 +85,20 @@ ifeq ($(BR2_DEBUG_3),y) TARGET_DEBUGGING=-g3 endif -TARGET_CFLAGS=$(TARGET_ABI) $(TARGET_OPTIMIZATION) $(TARGET_DEBUGGING) +TARGET_CPPFLAGS = -ifeq ($(findstring yy,$(BR2_mips)$(BR2_MIPS_ABI64)),yy) -TARGET_CFLAGS+=-fno-pic -mno-abicalls +ifeq ($(BR2_LARGEFILE),y) +TARGET_CPPFLAGS += -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 endif -ifeq ($(BR2_LARGEFILE),y) -TARGET_CFLAGS+=-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 +TARGET_CFLAGS = $(TARGET_CPPFLAGS) $(TARGET_ABI) $(TARGET_OPTIMIZATION) $(TARGET_DEBUGGING) + +ifeq ($(findstring yy,$(BR2_mips)$(BR2_MIPS_ABI64)),yy) +TARGET_CFLAGS += -fno-pic -mno-abicalls endif -TARGET_CXXFLAGS=$(TARGET_CFLAGS) -TARGET_LDFLAGS=$(call qstrip,$(BR2_TARGET_LDFLAGS)) +TARGET_CXXFLAGS = $(TARGET_CFLAGS) +TARGET_LDFLAGS = $(call qstrip,$(BR2_TARGET_LDFLAGS)) ifeq ($(BR2_TOOLCHAIN_BUILDROOT)$(BR2_TOOLCHAIN_CTNG),y) TARGET_CROSS=$(HOST_DIR)/usr/bin/$(GNU_TARGET_NAME)- @@ -153,9 +155,10 @@ FLEX:=$(shell which flex || type -p flex) BISON:=$(shell which bison || type -p bison) SED:=$(shell which sed || type -p sed) -i -e +HOST_CPPFLAGS = -I$(HOST_DIR)/usr/include HOST_CFLAGS ?= -O2 -HOST_CFLAGS += -I$(HOST_DIR)/include -I$(HOST_DIR)/usr/include -HOST_CXXFLAGS += -I$(HOST_DIR)/include -I$(HOST_DIR)/usr/include +HOST_CFLAGS += $(HOST_CPPFLAGS) +HOST_CXXFLAGS += $(HOST_CFLAGS) HOST_LDFLAGS += -L$(HOST_DIR)/lib -L$(HOST_DIR)/usr/lib -Wl,-rpath,$(HOST_DIR)/usr/lib HOST_PATH=$(HOST_DIR)/bin:$(HOST_DIR)/usr/bin:$(PATH) @@ -184,12 +187,14 @@ TARGET_CONFIGURE_OPTS=PATH=$(TARGET_PATH) \ CXX_FOR_BUILD="$(HOSTCXX)" \ FC_FOR_BUILD="$(HOSTFC)" \ LD_FOR_BUILD="$(HOSTLD)" \ + CPPFLAGS_FOR_BUILD="$(HOST_CPPFLAGS)" \ CFLAGS_FOR_BUILD="$(HOST_CFLAGS)" \ CXXFLAGS_FOR_BUILD="$(HOST_CXXFLAGS)" \ LDFLAGS_FOR_BUILD="$(HOST_LDFLAGS)" \ FCFLAGS_FOR_BUILD="$(HOST_FCFLAGS)" \ DEFAULT_ASSEMBLER="$(TARGET_AS)" \ DEFAULT_LINKER="$(TARGET_LD)" \ + CPPFLAGS="$(TARGET_CPPFLAGS)" \ CFLAGS="$(TARGET_CFLAGS)" \ CXXFLAGS="$(TARGET_CXXFLAGS)" \ LDFLAGS="$(TARGET_LDFLAGS)" \ @@ -210,6 +215,7 @@ HOST_CONFIGURE_OPTS=PATH=$(HOST_PATH) \ GCC="$(HOSTCC)" \ CXX="$(HOSTCXX)" \ CPP="$(HOSTCPP)" \ + CPPFLAGS="$(HOST_CPPFLAGS)" \ CFLAGS="$(HOST_CFLAGS)" \ CXXFLAGS="$(HOST_CXXFLAGS)" \ LDFLAGS="$(HOST_LDFLAGS)" \