From patchwork Thu Feb 7 22:01:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nick Desaulniers X-Patchwork-Id: 10802185 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id DF2B913A4 for ; Thu, 7 Feb 2019 22:02:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CEA1E2E71C for ; Thu, 7 Feb 2019 22:02:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CC4B42E730; Thu, 7 Feb 2019 22:02:40 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI, USER_IN_DEF_DKIM_WL autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 743082E71C for ; Thu, 7 Feb 2019 22:02:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727090AbfBGWCk (ORCPT ); Thu, 7 Feb 2019 17:02:40 -0500 Received: from mail-it1-f202.google.com ([209.85.166.202]:43036 "EHLO mail-it1-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726925AbfBGWCj (ORCPT ); Thu, 7 Feb 2019 17:02:39 -0500 Received: by mail-it1-f202.google.com with SMTP id p124so2294992itd.8 for ; Thu, 07 Feb 2019 14:02:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=K0M49omsRwIKeW5zWET20jPe2lVNAfQ5m7GbqMaJYbE=; b=hoBwgSPC4iUGIYLp/p9AbVZY/vdXNqM0t+kVb0+ZzI9CXouraAjcLv2JerIIQj8+Vj djaCunPvOWlH/OoZy9uRACSwhgsh3qzqazg1KqsteXq52nVsSbqOp9OfgCZz3y/ADaR5 BDSu3oYzWzcr+L5xhPhhaPa/OE9Lo/PbeHijtn7Pp470SZKoVIyPzFxy11y95Q5FTWeC FFJ8iIMJLX5FfaZ/l0bk9X8DYMSTvIEOjraQnqq9q9HHT2pMmm4JJTnS1Q3Ds9n43JiD /vfFJz/9zEO1quFrZz2p32oAT3tjf3T/uI33mUoVXIEEoCt+jcRIckLEFz+/kbgHO97P mgbQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=K0M49omsRwIKeW5zWET20jPe2lVNAfQ5m7GbqMaJYbE=; b=PLpNVXfWH+9nkSVB4A+Yy5JloyT3wBn3FgBHjbyjSOQ8/NwOAZuZqey6e2s3vlzb4T PNvyET95NSZdq1m3n7PlO5aeGgURZ2a+qPZBlvh6UmdTBgEMNUhPe49M8MlYIbdxp5tw la0ZUcqjhWMCYLz40+JJwgFkjz6ASFXiK/Lh/moWQbKGuwa5PyebfOlgiaA/ezbZUWSH WXWmMzAzDqCbm0sXvIldZ5KC+5u4eLLYi/44c2s8gnWoSiGpIzzb+CD+DFHEMWNV0qsF GZPpVPcidXQJo54dnqASnIoDkLs6mLSSgth87COBbKEV/CQS70wt4Fyp1ZtsRlW+WcYP OUfQ== X-Gm-Message-State: AHQUAualrj8Zx2Z6m5o5KhqkpTFgrhtuP+iIPTrMDiBXRupknuYZihav 80Qx8J0z0EVDk03810Rw2VIpqSrTWhmeTpzMWu4= X-Google-Smtp-Source: AHgI3IaeJBxN+8seessG4GsDgvTBxyTTmrCBHcmKW3evwnw1QYPPcQl9e5B5fx5xvUBmhNfMI1y687pmNtj++y9uEt4= X-Received: by 2002:a24:3653:: with SMTP id l80mr7872820itl.3.1549576958955; Thu, 07 Feb 2019 14:02:38 -0800 (PST) Date: Thu, 7 Feb 2019 14:01:50 -0800 In-Reply-To: <20190207220155.81351-1-ndesaulniers@google.com> Message-Id: <20190207220155.81351-2-ndesaulniers@google.com> Mime-Version: 1.0 References: <20190207220155.81351-1-ndesaulniers@google.com> X-Mailer: git-send-email 2.20.1.791.gb4d0f1c61a-goog Subject: [PATCH 2/4] Makefile: clang: choose GCC_TOOLCHAIN_DIR not on LD From: ndesaulniers@google.com To: yamada.masahiro@socionext.com Cc: Nick Desaulniers , Nathan Chancellor , Michal Marek , linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This causes an issue when trying to build with `make LD=ld.lld` if ld.lld and the rest of your cross tools aren't in the same directory (ex. /usr/local/bin) (as is the case for Android's build system), as the GCC_TOOLCHAIN_DIR then gets set based on `which $(LD)` which will point where LLVM tools are, not GCC/binutils tools are located. Instead, select the GCC_TOOLCHAIN_DIR based on another tool provided by binutils for which LLVM does not provide a substitute for, such as elfedit. Fixes commit 785f11aa595b ("kbuild: Add better clang cross build support") Link: https://github.com/ClangBuiltLinux/linux/issues/341 Suggested-by: Nathan Chancellor Signed-off-by: Nick Desaulniers Reviewed-by: Nathan Chancellor Tested-by: Nathan Chancellor --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 3142e67d03f1..0eae4277206e 100644 --- a/Makefile +++ b/Makefile @@ -492,7 +492,7 @@ endif ifneq ($(shell $(CC) --version 2>&1 | head -n 1 | grep clang),) ifneq ($(CROSS_COMPILE),) CLANG_FLAGS := --target=$(notdir $(CROSS_COMPILE:%-=%)) -GCC_TOOLCHAIN_DIR := $(dir $(shell which $(LD))) +GCC_TOOLCHAIN_DIR := $(dir $(shell which $(CROSS_COMPILE)elfedit)) CLANG_FLAGS += --prefix=$(GCC_TOOLCHAIN_DIR) GCC_TOOLCHAIN := $(realpath $(GCC_TOOLCHAIN_DIR)/..) endif