From patchwork Mon Feb 11 19:30:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nick Desaulniers X-Patchwork-Id: 10806723 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 0B85B6C2 for ; Mon, 11 Feb 2019 19:30:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F17712B093 for ; Mon, 11 Feb 2019 19:30:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E4D372B0A8; Mon, 11 Feb 2019 19:30: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 857FA2B093 for ; Mon, 11 Feb 2019 19:30:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388243AbfBKTak (ORCPT ); Mon, 11 Feb 2019 14:30:40 -0500 Received: from mail-pf1-f202.google.com ([209.85.210.202]:40688 "EHLO mail-pf1-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731469AbfBKTaj (ORCPT ); Mon, 11 Feb 2019 14:30:39 -0500 Received: by mail-pf1-f202.google.com with SMTP id g9so59971pfe.7 for ; Mon, 11 Feb 2019 11:30: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=d5X1DHNjDUb5NLL3O4YMEIQYPjCFJAnKD/tNSL5RNTA=; b=ZBVmQgwn6wPvQ808Q2qhEWWaFjM6+9X1q8IZ4ZIKeyEJduZfSgRN2FFUZoJEnmFB61 2izQC8j/FEojBJj296AnNPhLv0IHe8E/75uimTQC+TQnX9aMXrNSlUNjZNg56yooRaO3 LiGHDs/lGY3lEEWv4ziLOkQSDdDXbM9uCuY/bJ1px4k5FfpKNqeLnjCcldjnuDEaeP1a +Z0PuNJIMAGlUG0CtpTgdrTQo/fErysoynGFb9yZi+Qk1oiC93I3p2jnrcTrBRflFBW9 Q5bvbEwRTjz3Rb5FX/HMP5FfhF7CmjZrBR8lM5fozm4sNYfqsPTTIpmougO9/NdQOWik vYVw== 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=d5X1DHNjDUb5NLL3O4YMEIQYPjCFJAnKD/tNSL5RNTA=; b=ApFRDNAjsYV/UvDN8OWpDkT37cJyheDwXz9C3dmg8bCaUaTB/ndKp+7pMpOh/J2x3W Wk5VwfNRWxeYikSXCxfQSD9wlclWBPJDg7k1BEm1eCcY7AqoR3g66AOrJ57nJda7hryG QAjdjg7ppPi2tSvN5/yzVw2YJKuZtNvR568LZxTN0yHPti8DuO/XujMUctiujQKrL76u JZlHCe5DjSmJcMCpFJaUE3f/oa+PkhfazgvwmvVQN84arSBqXFCYKBLUuSP/DlXveXHP Vcjsm0ofzwjnlz1T82j1hd4n0+C7qiNZkFoomJkY++SLJK3xyHgDe7zb+XKHTvzbfWD6 3JWQ== X-Gm-Message-State: AHQUAuYpOIbicGuhJi5SK5Zi9pGIOyC+jGV6kthKE9y1cL2RlEUTq/9f Sq0FABLBLJc3/tehJIegTJXCy+lUw0TZB0yapQM= X-Google-Smtp-Source: AHgI3Ib3P7TggZpwqevlzSKuItbQf2rXHsRRYH3FFQnxMn84Vtvz0Kpep/2mKvDgaWdyk6EZ2VrQF8XPawp0tYV1UB0= X-Received: by 2002:aa7:8acb:: with SMTP id b11mr1064903pfd.72.1549913438630; Mon, 11 Feb 2019 11:30:38 -0800 (PST) Date: Mon, 11 Feb 2019 11:30:04 -0800 In-Reply-To: <20190211193008.24101-1-ndesaulniers@google.com> Message-Id: <20190211193008.24101-2-ndesaulniers@google.com> Mime-Version: 1.0 References: <20190211193008.24101-1-ndesaulniers@google.com> X-Mailer: git-send-email 2.20.1.791.gb4d0f1c61a-goog Subject: [PATCH v2 2/4] Makefile: clang: choose GCC_TOOLCHAIN_DIR not on LD From: ndesaulniers@google.com To: yamada.masahiro@socionext.com Cc: natechancellor@gmail.com, sedat.dilek@gmail.com, keescook@chromium.org, samitolvanen@google.com, michal.lkml@markovi.net, akpm@linux-foundation.org, hannes@cmpxchg.org, peterz@infradead.org, linux@dominikbrodowski.net, npiggin@gmail.com, mathieu.desnoyers@efficios.com, gor@linux.ibm.com, adrian@lisas.de, rgb@redhat.com, linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org, Nick Desaulniers 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 Reviewed-by: Nathan Chancellor Tested-by: Nathan Chancellor Signed-off-by: Nick Desaulniers --- Changes V1->V2: * add reviewed and tested tags. Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 86cf35d1d79d..d3b65e96d183 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