From patchwork Tue Nov 7 15:05:53 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 118188 Delivered-To: patch@linaro.org Received: by 10.80.245.45 with SMTP id t42csp639833edm; Tue, 7 Nov 2017 07:13:03 -0800 (PST) X-Google-Smtp-Source: ABhQp+RsGmpVTua2Rue2HhqDINdgmSZrh0nM902SdqYpKS819BXjlLivJYZgnbtYHagM/MiJ+j/y X-Received: by 10.129.79.138 with SMTP id d132mr12471323ywb.236.1510067583185; Tue, 07 Nov 2017 07:13:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1510067583; cv=none; d=google.com; s=arc-20160816; b=muAH3gmkwNOZ+wL16AfvlqnrW0x9FImPP8+E8Kcv32vmF7qCM7kuSdfFfzAYaLgqDw PA9FxUcGjVZMb+z12gcezsfgOSRLwcKyGpLhzCN9dCsDCGhJSElgsCccTJYzKo7AsxpA /0KzbfpkKT/wQWqhVLSvhHjEslmLfed5cnDeVYT0rzyqR/IdSw6s2ihv6qNwRDNJaf+A ga9SW6VVa6r7R5SCDrrU867CATdz62f0KHAJ2/6fnOPNo1oQG5ure63ud4lP6YZAGDoM cdkOGHGZCLNKOUCnCFq+/deg/+u1N7tYsa0W8TRvmNnBRQVvw2JjnfDmMpfQOyHhuZVo U61A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=/zYE1prZ1q5lHhUgPRpT3/mNwOoYSNwS4ZLxfqAqGxE=; b=MkS9IOcc525kvp2Nu3mlCOtUf8W6n6VUmek2mUKHMIprtK5JslJn4jhT/dBvjEN/8u xj0jyRL9iy19IUKkvW/KLZtNFvjI218aFCvJdl7YeV1tHHwi+zATKUDmSf79ofCv2IMo Q/WyQW2KcKHFjBB3sKTMV0X/Z6i1NPdst7AvGVVn4bgVmxOCI0+X4OW5O33V0Wv9q2ri Nztv5u9Ev7ChVYMMU4Kr+bHZhbEOiJnkDv8+YulW2SuEHtfJgEGVrj9C3VI7vhJ5WqRc JSMZQRi2PxX8oUQuJ4+84O4h8NFbZWi1ELCsbzzIk+vm43EZ9et9v5lDjQyzT3hNCqKo s/ig== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=iiyabpAr; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id e203si315225ywc.543.2017.11.07.07.13.03 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 07 Nov 2017 07:13:03 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=iiyabpAr; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:53876 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eC5Yk-0001sl-Gy for patch@linaro.org; Tue, 07 Nov 2017 10:13:02 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34806) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eC5SK-0005qO-4N for qemu-devel@nongnu.org; Tue, 07 Nov 2017 10:06:30 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eC5SF-00005o-AL for qemu-devel@nongnu.org; Tue, 07 Nov 2017 10:06:24 -0500 Received: from mail-wm0-x244.google.com ([2a00:1450:400c:c09::244]:54009) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eC5SF-00005O-3W for qemu-devel@nongnu.org; Tue, 07 Nov 2017 10:06:19 -0500 Received: by mail-wm0-x244.google.com with SMTP id r196so4567073wmf.2 for ; Tue, 07 Nov 2017 07:06:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=/zYE1prZ1q5lHhUgPRpT3/mNwOoYSNwS4ZLxfqAqGxE=; b=iiyabpAr9ji1CR2NjXefrWc7DU+D7jlqbKw8QO9ZaCsFu1k6i7xRpXfIK5CYdc8nxb Z8dvaHX+jO1KQfMXiyilJpVmTr56dtD0cyV3ncFtfZX9u2Rrt30+5uus+4o8B8Y4VNDJ drpmbyGmmIuB9kuSoae00Gfdj6G7BqsqD1Qtc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=/zYE1prZ1q5lHhUgPRpT3/mNwOoYSNwS4ZLxfqAqGxE=; b=dSF8B8kDziwBV5sjs+9KWbHvEsiNpBHkg9IMk4gfD4KaSIG+Gx33idB05ANibDGSAH lCLXJz8qErDdoUunvNSfDuZwr1jkkI9IMxuLvsBiYCbcqIK8uKlI7aVdzC7013EAmr/W wcdew5RFq+mx69BnrxMS+DEsjgCJHVPZwjQ5IDKJguGGv89hCqUCwftWCDStcKxy/tVE bAtcUrJcgJNdx9x8hTdOkhvDg+DMmj7pUOdbMvquLvVAaeIuleGI1W86PHz74lfDi2pK 5UTZejuj8P57UBlfvLArkM8EnqX5pDR63cIfhkuxxdXd8J4y0VHKa8Mm9syFVLEWYNk9 5Psw== X-Gm-Message-State: AJaThX7qW/NrN+RlZYkb0ovUUwDyUB2isifMGEdwwHeP7ZmyHViAWj3A XqjKO1gN2ZnN83tKOdLasi/b/g== X-Received: by 10.28.239.2 with SMTP id n2mr1524801wmh.140.1510067178035; Tue, 07 Nov 2017 07:06:18 -0800 (PST) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id r23sm781899wrc.93.2017.11.07.07.06.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 07 Nov 2017 07:06:15 -0800 (PST) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id BDA543E044B; Tue, 7 Nov 2017 15:06:09 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 7 Nov 2017 15:05:53 +0000 Message-Id: <20171107150558.22131-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20171107150558.22131-1-alex.bennee@linaro.org> References: <20171107150558.22131-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::244 Subject: [Qemu-devel] [RISU PATCH 05/10] configure: allow repeated invocation of configure in build dir X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-arm@nongnu.org, =?utf-8?q?Alex_Benn=C3=A9e?= , Dave.Martin@arm.com, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Otherwise a second configure run will totally miss out the setting of BUILD_INC. I made the link -sf as it seemed the easier way around. Signed-off-by: Alex Bennée --- configure | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.14.2 diff --git a/configure b/configure index 1dc527b..c622a5e 100755 --- a/configure +++ b/configure @@ -176,10 +176,10 @@ fi # Are we in a separate build tree? If so, link the Makefile # so that 'make' works. -if test ! -e Makefile; then +if test ! -e Makefile || test -s Makefile; then echo "linking Makefile..." BUILD_INC="-I $(pwd)" - ln -s "${SRCDIR}/Makefile" . + ln -sf "${SRCDIR}/Makefile" . fi generate_config