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: 157783 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp1200897jaa; Thu, 7 Feb 2019 14:02:42 -0800 (PST) X-Google-Smtp-Source: AHgI3IaRnAm9Wf+GgmS3yG6BssR6n9V2B0NsLoaTqVrIlD+6forRih7fzrZEuT8penXZS3x1eJWk X-Received: by 2002:a17:902:8686:: with SMTP id g6mr16727193plo.149.1549576962528; Thu, 07 Feb 2019 14:02:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1549576962; cv=none; d=google.com; s=arc-20160816; b=h9pWi0l5X4ss/+G+0E40HJf4Lnpyfoq7cUkoLSpckNZQ4sMcWW0sR7A2/1JYpOYZFH EmjM/w7n2msUH9t9HOtG81J78EAh1XjW0GvaUOcGN0LllUPmlRugj1sQuYx+Iz+XpmRI clFliGaLCScJCBCHreHrGY0egQ8Z5mdWoKIx+LIwV1jErF76jFGvBfIre1EC6iqhATIM nTnbWh5k4LdAVO4DuJ5YfFGKU5WvOVF1aFlMa/pFiEFXxoDaacgQEk89pvLGdkACDDPu X1r3Eo7okiKL55cPg6cWRhyOObBweb/T6puFAwpEnmPF67bY8DMlg1m3sdHQ1ea+5nvX HXLw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:cc:to:from:subject:references :mime-version:message-id:in-reply-to:date:dkim-signature; bh=K0M49omsRwIKeW5zWET20jPe2lVNAfQ5m7GbqMaJYbE=; b=XOjf7XnQcb0Vt+c6fu50Sd+ptcsNWt71a0FLjQom6nSeuVVFuk9bK7ECNxWQLlRWRy YPRbNtcBSD3DufCIteh48x51pyvOSCA41jLI0ivn+8CZg1kdRTPoIJuE15Lkvl1P+Eiv 1P+6ZeKcZxCAvjEKm9sIViVVkdmBj45b+zudZ3VNKHzp3oc8adRm8vfJZwzzVYZ0ajfS lYTxWc3wO+eWr4VWu+cgEjqigqzydBFYf9wbifQSEm1Wce6ZYkhsIrWSvuUsPMnYmQ5L S3AL2Wb+9LyyKs3vhNYZxXbnRoUaQOLAB5HaaWAQBIGIt7cKS1trjw0aOU7F+4PEeKVv NfHQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=hoBwgSPC; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id g63si185486pfc.60.2019.02.07.14.02.42; Thu, 07 Feb 2019 14:02:42 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=hoBwgSPC; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727120AbfBGWCk (ORCPT + 31 others); Thu, 7 Feb 2019 17:02:40 -0500 Received: from mail-it1-f201.google.com ([209.85.166.201]:55447 "EHLO mail-it1-f201.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727085AbfBGWCj (ORCPT ); Thu, 7 Feb 2019 17:02:39 -0500 Received: by mail-it1-f201.google.com with SMTP id j3so2441961itf.5 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=QiON6AxjlT+KMJgLRFHmtJHLlKbukAS5QEK4dKxtf1reJowPV/9z/3AcpMfuaJ0qln mIsAanBOqNyrV/ju7ndhUEp072dsKnP8mT5accSBHxBDBcU5kQMgs3AUGCr8cTqU8iT5 iTDTdH1mpou3FUiuZpSe2Xwy0fVhhBp66EmCkNEY7Uku2t3v4wU34bbiVL3FY22vI1I/ EFSNCexRFjbezpMzB+KIVvpKLqTKHuqfOBn5KbP+jD/sfaZOkFYujrIgbVcRYIvhdAds AA70chuFjVcR0Bc1cmYxWQwfwUh7hPuFlLCpFfqmW88fnEJoFzUiNTmeMr1divsAjwDO LJ9g== X-Gm-Message-State: AHQUAuZiIz3cfuh11EkOoCju3vsimXoEhgHPrZbiqWUoGrIpMWZusAGX a+GY/G8Jsmhq9y4edk/PBjn4Ytcwit8pBrPtGSU= 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-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.20.1.791.gb4d0f1c61a-goog Reviewed-by: Nathan Chancellor Tested-by: Nathan Chancellor 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