From patchwork Mon May 7 12:10:31 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?S=C3=B8rensen=2C_Stefan?= X-Patchwork-Id: 909721 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=spectralink.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=spectralink.onmicrosoft.com header.i=@spectralink.onmicrosoft.com header.b="snucG9DZ"; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40fhfP1LHBz9s34 for ; Mon, 7 May 2018 22:25:31 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 3BE65263CE; Mon, 7 May 2018 12:25:27 +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 Vu8TsVrZjtBr; Mon, 7 May 2018 12:25:23 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id B6D1C23B9F; Mon, 7 May 2018 12:25:23 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 801481BFCC3 for ; Mon, 7 May 2018 12:25:22 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 7B37186346 for ; Mon, 7 May 2018 12:25:22 +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 A6LUjNnUN6g2 for ; Mon, 7 May 2018 12:25:20 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from NAM03-DM3-obe.outbound.protection.outlook.com (mail-dm3nam03on0109.outbound.protection.outlook.com [104.47.41.109]) by whitealder.osuosl.org (Postfix) with ESMTPS id 75C7D868E9 for ; Mon, 7 May 2018 12:25:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=spectralink.onmicrosoft.com; s=selector1-spectralink-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=7Wicn4nUfqj7CBAYqvCw9c9v9kH4qXhWqKmCIbHp8yQ=; b=snucG9DZ33oOQAFasyVefYrMLxyKh5382AnnKCv5CGFUSzp3zx8TsyiajhpHeH5AFSiUjpMiniSQyZiYHgpGcf9r/UEen5Mx8qdXiqvJr09dhQojQJFJZaSH18GwQy66nHpi83CAXMupLNRgRy+eg6RzJd/ZKhBo6DxJjL1mPYs= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Stefan.Sorensen@spectralink.com; Received: from e31020.spectralink.com (213.83.164.162) by MWHPR07MB3485.namprd07.prod.outlook.com (2603:10b6:301:63::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.735.17; Mon, 7 May 2018 12:10:57 +0000 From: =?utf-8?q?Stefan_S=C3=B8rensen?= To: buildroot@buildroot.org Date: Mon, 7 May 2018 14:10:31 +0200 Message-Id: <20180507121032.25794-3-stefan.sorensen@spectralink.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180507121032.25794-1-stefan.sorensen@spectralink.com> References: <20180507121032.25794-1-stefan.sorensen@spectralink.com> MIME-Version: 1.0 X-Originating-IP: [213.83.164.162] X-ClientProxiedBy: HE1PR1001CA0022.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:3:f7::32) To MWHPR07MB3485.namprd07.prod.outlook.com (2603:10b6:301:63::24) X-MS-PublicTrafficType: Email X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:MWHPR07MB3485; X-Microsoft-Exchange-Diagnostics: 1; MWHPR07MB3485; 3:Q5xt3OyA4no8mEnZuSCqteNVvnmQYVHyRm2hU6tC+ZA5+G6mNAabEFNZZPYNdvuDpN5cvRyuVOaFvhWjHHbMr+Bbwwm5Zpux6kJXgj6DLuzHPEsjCl2/iSlxnienMDrGi7gDMxpC3+i64wSt0A/6B1F4TNFCdpaME1p20dCKF/3qBhK/pwxrwbyw6F9LckmGNUEm/dYfPmdFP2ymUY5AOvA+zKqYLOt+LfbtB1Lp8qOooi/ITDCbcovTwV/x8k5D; 25:yKDC3E+GhaKgDO9Bpk3blXBkxhNP9HWCqi5C+gzIRYgc20/NHVmjOmX01Jhbpq7TJgLSY5O8fAoNvnamyV4vy1yPNDD353fqsut0I+inhQcX+2an6uAe5NmcML9RQuZ8d/YADZPQkN3FBUxiCNZQTzHJMmOgX+FE1isqGSwLPHxSPTalKO3zO5UmwNkiEGuNsKrSoyp++uwn3tIuAid3SAXJfOfeYAZLTZyqM0IzCZZlAVnAN6VFRGX/ROQmVure1r6rY+HrHZZ6iOdv19z77k9RPZoHgntwoqTbDA+UdzAY3e5cscpzSX+eTVZkRM4BGLw1gzpmzCna1MKvqPUISA==; 31:4nwGIz7dTwY0e0VrBbNC7h1sOZv7szU6Bu/f+oEnEehiDIPkncl7Iwh1i1FaskFKvaPNKq4VEdi7y9SbB2qVUiZFLD0VEAXVRZ3K3PnjpnE6G+/MzFiKu54eygGH8GjIH0qwblzuuZrvokCACFFopj7wKLQv0uW+G53DBWU0zP2IQJyIBHgsnaRHxjRaw47oQ2Zrsx3Y3kYWuZ1sArG5qNZsPRPGCjwoMV6t7FNsnxU= X-MS-TrafficTypeDiagnostic: MWHPR07MB3485: X-Microsoft-Exchange-Diagnostics: 1; MWHPR07MB3485; 20:DDI1zKYhjpj6BoDI2W5SUvNSio9sE22qP6TmdIL+veeG+nAlBT9poXJodiWgNDgujwpVGIFjIfHht6cXcEEyuU6nCGeFPbYi/3MYvgUXPcPY/RiTnJ18YXole92uMgs8aog3ZG1mf2GJQGXzuUkELgXoOmMmKxflws0WKIxNHCUJK3H0Nc6MenQBWHskrQI7xoFyufAS8u8QDqbfmMxXn17tPzBuRZQPPBXbOS+nbL0oy5tqfQ0BO713ZnzIWmqrRDsao2Bu24sil5dENUC/aLijFNzqnfdMBja/Yx7jn2y+vqC3Hejaln9Yqb+shEDIQntNczBN6/EXKzyfCzE0n4PdtbMn6ZIBiIhbtsmGyrmK5weVzwQvuhYpGjuYy8DbggdNFxc8LIW/2l3C6a6N6kkPhe8UXCoWBZHa1UdXwyqjgAvipTV9kKem8whpHCGXEFoCoaqtj/LnZfCqtwu9LHiUTWcRidBBho23FkzEWCAz6lLLqOBsHl1VHqTp1yNd1SwnwBybavP4ba/2SF5KA62SiK0N9klTIksnl24mEpL8Zdumt970xElGOIa+PxGyBBu84COudmAp0G2nUql30oB+p6txT8sLghr279cZB+c=; 4:6c5n0qlPPoJMezxBXtbaWfkcAXLWl2LXSuex+1fqtHYUBAYMjpIM7J1U1vZ06rafegWQ2Zx5iVl2uHERsivZ5ihDvkkJJD2UEfVe6T9BmTgD1tUenQogXdJHRmsLQIi+mph4PGmeEHlm0M63u2wBfCVxbTW9hLhyKsDMjVR/70ENpsPegtn1zj1w5lj8HSYyW1m1AJHQjLGEPtBx6oZY7H6uILTVbB2JVxEtnY/dSS0a1UequXfRj5kAfVZWtxSUAaHYwGfIMr0tUNVrkqQ9Dw== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040522)(2401047)(5005006)(8121501046)(3002001)(3231254)(944501410)(52105095)(93006095)(93001095)(10201501046)(149027)(150027)(6041310)(20161123558120)(20161123562045)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(6072148)(201708071742011); SRVR:MWHPR07MB3485; BCL:0; PCL:0; RULEID:; SRVR:MWHPR07MB3485; X-Forefront-PRVS: 066517B35B X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(979002)(376002)(39840400004)(396003)(39380400002)(346002)(366004)(199004)(189003)(2361001)(59450400001)(6306002)(4326008)(966005)(316002)(2906002)(72206003)(23676004)(2616005)(2351001)(7696005)(486006)(8936002)(52116002)(446003)(956004)(11346002)(386003)(97736004)(86362001)(476003)(16526019)(186003)(26005)(76176011)(36756003)(6916009)(68736007)(106356001)(105586002)(53416004)(66066001)(6486002)(81156014)(81166006)(107886003)(69596002)(25786009)(1076002)(2870700001)(50226002)(8676002)(478600001)(50466002)(305945005)(7736002)(53936002)(5660300001)(47776003)(6116002)(3846002)(6666003)(217873001)(969003)(989001)(999001)(1009001)(1019001); DIR:OUT; SFP:1102; SCL:1; SRVR:MWHPR07MB3485; H:e31020.spectralink.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; Received-SPF: None (protection.outlook.com: spectralink.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?utf-8?q?1=3BMWHPR07MB3485=3B23=3AAzeW?= =?utf-8?q?X4wYlm1rbJcKc2ci3jOrnkGox0Vn9JP8qr5qUBvP+HqOSeHt+QQIsXGT?= =?utf-8?q?6NAqP0PodMxJTpCIdinKbT7EtahEqLS8tg6AqbcWKWmTcjnjMyCiGA/x?= =?utf-8?q?NettvMob1Q7oluEh2WI5JukANns16aXDtSN6AoQ0Z884i+SueouYvlAA?= =?utf-8?q?ljsWDa/EldbXC+kp8cN4wXBtCK2z/ScXkf0MGWWseeMzZn8XRDRGHhbi?= =?utf-8?q?TLh+qwEbsRC7v1uInyskICCEPvuduHsQ6VfKOgoljkMEW19LvkxaBylO?= =?utf-8?q?unjrkCbwA94Q/OBh18STHQ0SdN5OVB2s1OtZSsASUgFarYTPH+Z4Jnx/?= =?utf-8?q?H9eDFlJxbfGobNOgxVX6ZWptnNhEHh4ST3gh5uIGcgstrgkInyhkLHKq?= =?utf-8?q?C9s+8WXzlJUBqvPv/VpUJoKIS6XGr/PPvpkOzEYik473uDh8LKeRr1em?= =?utf-8?q?ae8yW4Q+GU1CbX6TiM40G98Z46XH0sCb4+XRZud9WK4DwVb1Ws3V/yUM?= =?utf-8?q?Xzdz5A7QITwQAqyZvRSwUxx52frSapCuxaASLo66nYHVv8nVlQ0HWEeg?= =?utf-8?q?3Zuui7oYrncmO1LKUMxYEOFu+jGyvAYrq0kGqwefTvN/6UKDqmkYoHVO?= =?utf-8?q?10PEVoxLiT3CLRulQIpfpXon0tLW0mEnEuu2zfaluNdvwK3d4YgViuzx?= =?utf-8?q?AsXCb/oBbJQQOL9Y2vKTnXz5zGeqdhvan+EIB0Bfr6pYEh0ygGA1ysh6?= =?utf-8?q?hKg2yks0vkpU9MIvu1eSaWYKUfetbN1ICWTznFSzaDGhtkENBTBkdDhk?= =?utf-8?q?2atyubDZqc76cD/2u8YJW3DAd8wlrJzU3XNhRTsHIjNMix6Ub9/R9G5l?= =?utf-8?q?k6ATDOiHinYRoN9MYUhV5+76M2rikHLKMeA8GqpMEMzFxDKdH3GY8OPJ?= =?utf-8?q?NsZIKTefBEgGqKR9aDNTTfH+JYkeL1FGN3ZXSWafDq0068fSVeZt4kBi?= =?utf-8?q?TZQb47SRg5enzitp1lUfxWsG/l5mG5FOKw1uNde5w6Z6pxD6y9bJeDSL?= =?utf-8?q?gfBTO7sivJMkGOrktoREUBvGt6+OCrk2HV+SQdGSLoGCNasSJLebcM67?= =?utf-8?q?7Sol8iH8exHxSfm6EDJ11Q5wJuFOM7tGfHQCKorFACEVNWHe6UYynLLy?= =?utf-8?q?+rcDCrmQ8vKHkENhLWWfkEoG9EzpidOxphbJ29FQ4GGGCMWNaerXRzL8?= =?utf-8?q?qk8o6PEwi/wFy1E5vXTn3KQJBd1FWqvlaPT0DAIVego7sDhzSyb3a183?= =?utf-8?q?1no2Ge7Z+xe8c2vVWjhdWgWBPJQoKTyjMtJSvksDYeh/bQ5rVGnbubVa?= =?utf-8?q?Wkxw4sbUbtM6gEK9pXtMOmRz4TMKYnNYkr0ZXcoYhsmMbfywB/TLhKRE?= =?utf-8?q?OdcFXKNcJwhW9vRC6x0yylvJh14JgJTo09HLehL/MzU3eyiMNrdv48xx?= =?utf-8?q?XgFM4sDz6InpuRjdAX8KhVRiKoXWjg8qs0n1oYtokkDabw8sFRzv5tRh?= =?utf-8?q?U108zZkOxHfu?= X-Microsoft-Antispam-Message-Info: ofRtTxB4XOZI5L9Ri6M3K98+2rC2I0ilslUZGto8aX9IMrDFKKLDL/ezyLhgz8+W2KTD9q3SNiTTG1sSKytzRjThV5UjMwdPc08IuaITWfpIA7NipTwZsUt6NLmKlUaaPkotF3eHFXB8y08lD+kHm88+r/9cvHqnIlj2/dX620QtR8wIVQIIixMreUA7N0BA X-Microsoft-Exchange-Diagnostics: 1; MWHPR07MB3485; 6:d4nMmNdAUbRp/hk0OSa0L0TXMAbD4QUtTLdY9tZUyr6ZKcDm1iBOwwizUHKSS1NjplF1XO6ZFfRbLwuslFWbI2WBz2UWAlrEbdb8BI7ecFLfLH96LYRebi/5IYbrsgfg0qd6bSHwlxTUEydrpO7q1DUsiEPElgOVxTmsgyq0AegD/I9FfDJ6EYl3wlvSmoEEKwi+19/oaCzcOuZ2ARHh1hpG1DZQwo0MBnEYO7HIykUvkujfUtc4SCdgr8pOyux5uGYxi09z3WoGZkPAudmQzWRkF9DhfEL4/HIGs7EcXKWzQnaUOdL1o1IRuVbtAdzCiOy3/kzYIiE/a79aMH4WzYmztHQBdp8fY7mKzxW9zm1hFnGmEBxRxpIZw2As6tFiJhaJCLTt8y3KMVEtq5A8xVd2jn4f/uDtIqSheoz/DuxUKkqiVJcBHruObjlyUbjR4KBTxEhgxHeJnZgRILZ5rw==; 5:OWjpseO+oLM03tbuFa37N2Sw5UZfxxOa9cwKUsy8N+GZvSsNP6mtK6Cm93KkiSkkqPgmSmww8Mje17vYIhLBNPcoHCVXEzIo7aZTk0Y9ZsXZVzmdRmuB++80cDdN4EOh8GZAtRnrx2VtR3/tzQ+x2d+JalpvJqbLU8hGjGhTNB4=; 24:yWCX/1IJfg4dUOxhfzZQky4e1LQSmC6P5HzqsLKjm5x76RPcMCfRt5YlI/wzzdiYuk3yvIPb24kvQK5niPT4toeloJlZBkOFo8Qv18hO6H0= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; MWHPR07MB3485; 7:0PFSTWh/ZeX0mXCGheOr+uLMppHKBzmMMFVXaT2Efse0JDmd+XzB/o9aru6v9AdNlMG7ef+u6p6zhr5fp7X8Bg0Lug2AjXWIEUXjvwyeDykpy+ONmmOqAzNBZTpTH063LTNyGQKZS2OPyx3ma3rrFNBP8bMfbIJ9nvzLI0/w2Cp3vf7ub321QyqSa42lUt+6ND5ANba7y+S6oXt15H+EDNohsOzXSRSHZVcIuk4K7HGbvGLdoyppYJdumBmkyLky X-MS-Office365-Filtering-Correlation-Id: 02410170-43fd-4d14-fb38-08d5b41397d8 X-OriginatorOrg: spectralink.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 May 2018 12:10:57.9313 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 02410170-43fd-4d14-fb38-08d5b41397d8 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: c45ba920-5298-4256-8585-360096d02150 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR07MB3485 Subject: [Buildroot] [RFC PATCH v2] toolchain: Integrate annobin gcc plugin X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" This patch integrates the annobin gcc plugin into the toolchain by adding a -fplugin=/annobin.so flag to the toolchain wrapper. This introduces a dependency on the host-annobin package to the toolchain, so in order to break the circular dependency, the dependency on the toolchain in the annobin package is shortcircuted to either toolchain-buildroot or toolchain-external. Signed-off-by: Stefan Sørensen --- package/annobin/annobin.mk | 8 +++++++- package/gcc/gcc-final/gcc-final.mk | 3 +++ toolchain/toolchain-external/pkg-toolchain-external.mk | 3 +++ toolchain/toolchain-wrapper.c | 3 +++ toolchain/toolchain/toolchain.mk | 4 ++++ 5 files changed, 20 insertions(+), 1 deletion(-) diff --git a/package/annobin/annobin.mk b/package/annobin/annobin.mk index 32a5d4b6f0..c1ee4e84f2 100644 --- a/package/annobin/annobin.mk +++ b/package/annobin/annobin.mk @@ -8,7 +8,13 @@ ANNOBIN_VERSION = 5.6 ANNOBIN_SOURCE = annobin-$(ANNOBIN_VERSION).tar.xz ANNOBIN_SITE = https://nickc.fedorapeople.org -HOST_ANNOBIN_DEPENDENCIES += toolchain +# toolchain depends on host-annobin, so shortcircuit the reverse +# dependency to avoid a circular dependency +ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y) +HOST_ANNOBIN_DEPENDENCIES += toolchain-buildroot +else ifeq ($(BR2_TOOLCHAIN_EXTERNAL),y) +HOST_ANNOBIN_DEPENDENCIES += toolchain-external +endif # The plugin has to be configured with the same arcane configure # scripts used by gcc, this prevents regeneration of the scripts. diff --git a/package/gcc/gcc-final/gcc-final.mk b/package/gcc/gcc-final/gcc-final.mk index 9897d18682..2dd28b7a40 100644 --- a/package/gcc/gcc-final/gcc-final.mk +++ b/package/gcc/gcc-final/gcc-final.mk @@ -116,6 +116,9 @@ endef HOST_GCC_FINAL_POST_INSTALL_HOOKS += HOST_GCC_FINAL_CREATE_CC_SYMLINKS HOST_GCC_FINAL_TOOLCHAIN_WRAPPER_ARGS += $(HOST_GCC_COMMON_TOOLCHAIN_WRAPPER_ARGS) +ifeq ($(BR2_PACKAGE_HOST_ANNOBIN),y) +HOST_GCC_FINAL_TOOLCHAIN_WRAPPER_ARGS += -DBR_ANNOBIN_GCC_PLUGIN='"$(HOST_ANNOBIN_GCC_PLUGIN)"' +endif HOST_GCC_FINAL_POST_BUILD_HOOKS += TOOLCHAIN_WRAPPER_BUILD HOST_GCC_FINAL_POST_INSTALL_HOOKS += TOOLCHAIN_WRAPPER_INSTALL # Note: this must be done after CREATE_CC_SYMLINKS, otherwise the diff --git a/toolchain/toolchain-external/pkg-toolchain-external.mk b/toolchain/toolchain-external/pkg-toolchain-external.mk index 8b2c283654..73af6777ed 100644 --- a/toolchain/toolchain-external/pkg-toolchain-external.mk +++ b/toolchain/toolchain-external/pkg-toolchain-external.mk @@ -241,6 +241,9 @@ TOOLCHAIN_EXTERNAL_TOOLCHAIN_WRAPPER_ARGS += \ -DBR_CROSS_PATH_REL='"$(TOOLCHAIN_EXTERNAL_BIN:$(HOST_DIR)/%=%)"' endif +ifeq ($(BR2_PACKAGE_HOST_ANNOBIN),y) +TOOLCHAIN_EXTERNAL_TOOLCHAIN_WRAPPER_ARGS += -DBR_ANNOBIN_GCC_PLUGIN='"$(HOST_ANNOBIN_GCC_PLUGIN)"' +endif # # The following functions creates the symbolic links needed to get the diff --git a/toolchain/toolchain-wrapper.c b/toolchain/toolchain-wrapper.c index c5eb813dd0..d45c9d4f59 100644 --- a/toolchain/toolchain-wrapper.c +++ b/toolchain/toolchain-wrapper.c @@ -94,6 +94,9 @@ static char *predef_args[] = { #if defined(BR_MIPS_TARGET_BIG_ENDIAN) || defined(BR_ARC_TARGET_BIG_ENDIAN) "-EB", #endif +#ifdef BR_ANNOBIN_GCC_PLUGIN + "-fplugin=" BR_ANNOBIN_GCC_PLUGIN, +#endif #ifdef BR_ADDITIONAL_CFLAGS BR_ADDITIONAL_CFLAGS #endif diff --git a/toolchain/toolchain/toolchain.mk b/toolchain/toolchain/toolchain.mk index 91c9ca2eff..5e59e277a1 100644 --- a/toolchain/toolchain/toolchain.mk +++ b/toolchain/toolchain/toolchain.mk @@ -10,6 +10,10 @@ else ifeq ($(BR2_TOOLCHAIN_EXTERNAL),y) TOOLCHAIN_DEPENDENCIES += toolchain-external endif +ifeq ($(BR2_PACKAGE_HOST_ANNOBIN),y) +TOOLCHAIN_DEPENDENCIES += host-annobin +endif + TOOLCHAIN_ADD_TOOLCHAIN_DEPENDENCY = NO # Apply a hack that Rick Felker suggested[1] to avoid conflicts between libc