Message ID | 20171107150558.22131-6-alex.bennee@linaro.org (mailing list archive) |
---|---|
State | New, archived |
Headers | show
Return-Path: <qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org> Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 3B5346031B for <patchwork-qemu-devel@patchwork.kernel.org>; Tue, 7 Nov 2017 15:11:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2BD40290EC for <patchwork-qemu-devel@patchwork.kernel.org>; Tue, 7 Nov 2017 15:11:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 20C952A15C; Tue, 7 Nov 2017 15:11:47 +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=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 8CB6F290EC for <patchwork-qemu-devel@patchwork.kernel.org>; Tue, 7 Nov 2017 15:11:46 +0000 (UTC) Received: from localhost ([::1]:53872 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org>) id 1eC5XV-0000gX-D1 for patchwork-qemu-devel@patchwork.kernel.org; Tue, 07 Nov 2017 10:11:45 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34806) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <alex.bennee@linaro.org>) 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 <alex.bennee@linaro.org>) 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 <alex.bennee@linaro.org>) 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 <qemu-devel@nongnu.org>; 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-Google-Smtp-Source: ABhQp+SS9mLCht14B9NDFwRNh9YceDjfYwxcgh4qJhidqHlOeI/X4k3+b7llhdos9Z1SqUlQ+sVDzA== 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=20Benn=C3=A9e?= <alex.bennee@linaro.org> 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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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: <qemu-devel.nongnu.org> List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe> List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/> List-Post: <mailto:qemu-devel@nongnu.org> List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help> List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=subscribe> Cc: qemu-arm@nongnu.org, =?UTF-8?q?Alex=20Benn=C3=A9e?= <alex.bennee@linaro.org>, Dave.Martin@arm.com, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org> X-Virus-Scanned: ClamAV using ClamSMTP |
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
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 <alex.bennee@linaro.org> --- configure | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)