From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1C2DCC10DCE for ; Fri, 6 Mar 2020 18:33:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E16522067C for ; Fri, 6 Mar 2020 18:33:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1583519585; bh=Cpm9TXTvjT1g0oElyjHz3sa+QmJOcFbax1X2Tq0nxeY=; h=From:To:Cc:Subject:Date:List-ID:From; b=Bp5jeA543ceUn5ADL+koMJf1op7udt603VhAs339m+CIEVwzIN3tm0DewCXVj3NOR 7peSBcHpq13J7nbm2LeUj2RjRBY6KqHdB8c0MzcyCqgXg12bVXY6jNHZ64JO0vWI1C Nl8NjKvIKU1rlM0ZvVMs5E2OiJ9upi0vZCgMSLEQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726462AbgCFSdE (ORCPT ); Fri, 6 Mar 2020 13:33:04 -0500 Received: from mail.kernel.org ([198.145.29.99]:52892 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726167AbgCFSdD (ORCPT ); Fri, 6 Mar 2020 13:33:03 -0500 Received: from localhost.localdomain (NE2965lan1.rev.em-net.ne.jp [210.141.244.193]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 8EDA320675; Fri, 6 Mar 2020 18:33:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1583519583; bh=Cpm9TXTvjT1g0oElyjHz3sa+QmJOcFbax1X2Tq0nxeY=; h=From:To:Cc:Subject:Date:From; b=kLrddGxm0GSHJQtkTdc+gVzJxLWUMdKN8q/NEsrLIIfJNclzn4r+TptaNxeTeVeES k+MJZ6nXnueouUUbsL3eknAYW8HPhyVy2NkNZft0TtdZ4RIVcgIa5LaqkimUfGS8/g CM3xLnH3O5UyTUfF7JpBSdaMrYv5asuPtm+AuMlw= From: Masami Hiramatsu To: Steven Rostedt Cc: Geert Uytterhoeven , Borislav Petkov , LKML , Ingo Molnar , Randy Dunlap , Andrew Morton , Masami Hiramatsu , Peter Zijlstra , Sasha Levin , Arnaldo Carvalho de Melo , Jiri Olsa , Masahiro Yamada , Michal Marek Subject: [BUGFIX PATCH v2] tools: Let O= makes handle a relative path with -C option Date: Sat, 7 Mar 2020 03:32:58 +0900 Message-Id: <158351957799.3363.15269768530697526765.stgit@devnote2> X-Mailer: git-send-email 2.20.1 User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When I compiled tools/perf from top directory with the -C option, the O= option didn't work correctly if I passed a relative path. $ make O=BUILD -C tools/perf/ make: Entering directory '/home/mhiramat/ksrc/linux/tools/perf' BUILD: Doing 'make -j8' parallel build ../scripts/Makefile.include:4: *** O=/home/mhiramat/ksrc/linux/tools/perf/BUILD does not exist. Stop. make: *** [Makefile:70: all] Error 2 make: Leaving directory '/home/mhiramat/ksrc/linux/tools/perf' The O= directory existence check failed because the check script ran in the build target directory instead of the directory where I ran the make command. To fix that, once change directory to $(PWD) and check O= directory, since the PWD is set to where the make command runs. Fixes: c883122acc0d ("perf tools: Let O= makes handle relative paths") Reported-by: Randy Dunlap Signed-off-by: Masami Hiramatsu Cc: stable@vger.kernel.org --- Changes in V2: - Fix tools/perf/Makefile because it has own O= pre-process. - Use tools/perf for example. - Add explicit Cc: stable@vger.kernel.org tag. --- tools/perf/Makefile | 2 +- tools/scripts/Makefile.include | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/perf/Makefile b/tools/perf/Makefile index 7902a5681fc8..b8fc7d972be9 100644 --- a/tools/perf/Makefile +++ b/tools/perf/Makefile @@ -35,7 +35,7 @@ endif # Only pass canonical directory names as the output directory: # ifneq ($(O),) - FULL_O := $(shell readlink -f $(O) || echo $(O)) + FULL_O := $(shell cd $(PWD); readlink -f $(O) || echo $(O)) endif # diff --git a/tools/scripts/Makefile.include b/tools/scripts/Makefile.include index ded7a950dc40..6d2f3a1b2249 100644 --- a/tools/scripts/Makefile.include +++ b/tools/scripts/Makefile.include @@ -1,8 +1,8 @@ # SPDX-License-Identifier: GPL-2.0 ifneq ($(O),) ifeq ($(origin O), command line) - dummy := $(if $(shell test -d $(O) || echo $(O)),$(error O=$(O) does not exist),) - ABSOLUTE_O := $(shell cd $(O) ; pwd) + dummy := $(if $(shell cd $(PWD); test -d $(O) || echo $(O)),$(error O=$(O) does not exist),) + ABSOLUTE_O := $(shell cd $(PWD); cd $(O) ; pwd) OUTPUT := $(ABSOLUTE_O)/$(if $(subdir),$(subdir)/) COMMAND_O := O=$(ABSOLUTE_O) ifeq ($(objtree),)