From patchwork Thu Aug 2 17:30:26 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 10472 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id BE78824039 for ; Thu, 2 Aug 2012 17:30:38 +0000 (UTC) Received: from mail-gg0-f180.google.com (mail-gg0-f180.google.com [209.85.161.180]) by fiordland.canonical.com (Postfix) with ESMTP id 8FE10A182B4 for ; Thu, 2 Aug 2012 17:30:38 +0000 (UTC) Received: by ggnf1 with SMTP id f1so8917088ggn.11 for ; Thu, 02 Aug 2012 10:30:38 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=e8RxJ6VGtQVOSebHcGPFMn6Qw88tm2T1jZZvpAbOmek=; b=MMyMLsDF+9114XEWkOTIWX8Q5bS2KovliGh5t8e4lVkX/51LPv1VRmITjgicNpV7Xl h4QgiGKp+vF+n5IErOE3KXIF19rBQIhq+ATAKDgF+JNcARfb+/uBrTc5BLT0D8PoBKAb 6OuZhmrP0ZCt3mPt5yGsHNtqnxOwBWFQu5pX7Bb+UBpRPgui1nIkrF6asLgCxWoG5mS7 iCcK1rye3CFQh4OWh5xY7/D3HrXNA4pqKCRyrUMG9VMmxHYXh+6dQyyZGfKTT7WNBZZK tx+IbsOoGDuWMvNglqVdQiu5e7pT0dCvmm+nz9U/IgUhvZ0Q+rGONT358B1zFd/PaI5t D/zA== Received: by 10.50.160.168 with SMTP id xl8mr5036413igb.25.1343928637637; Thu, 02 Aug 2012 10:30:37 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.50.87.40 with SMTP id u8csp270750igz; Thu, 2 Aug 2012 10:30:35 -0700 (PDT) Received: by 10.204.152.6 with SMTP id e6mr8507385bkw.85.1343928634458; Thu, 02 Aug 2012 10:30:34 -0700 (PDT) Received: from mnementh.archaic.org.uk (mnementh.archaic.org.uk. [81.2.115.146]) by mx.google.com with ESMTPS id fm6si6526797bkc.100.2012.08.02.10.30.33 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 02 Aug 2012 10:30:34 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 81.2.115.146 as permitted sender) client-ip=81.2.115.146; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 81.2.115.146 as permitted sender) smtp.mail=pm215@archaic.org.uk Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.72) (envelope-from ) id 1SwzEB-0002ww-P6; Thu, 02 Aug 2012 18:30:27 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org, Stefano Stabellini , Blue Swirl Subject: [PATCH 1/2] configure: Don't run Xen compile checks in subshells Date: Thu, 2 Aug 2012 18:30:26 +0100 Message-Id: <1343928627-11311-2-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1343928627-11311-1-git-send-email-peter.maydell@linaro.org> References: <1343928627-11311-1-git-send-email-peter.maydell@linaro.org> X-Gm-Message-State: ALoCoQlBww+fuMe2iv+1k6zcqQj/1ZZWv+oBlNmwCAbwopG6qRrVsr1iehZkNmty6UTY88lSVjm/ The Xen compile checks are currently run inside subshells. This is unnecessary and has the effect that if do_cc() exits with an error message then this only causes the subshell to exit, not the whole of configure, which is confusing. Remove the subshells, changing: if ( cat ; compile_prog ) ; then ... to if cat && compile_prog ; then ... Signed-off-by: Peter Maydell --- configure | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/configure b/configure index 027a718..c47e440 100755 --- a/configure +++ b/configure @@ -1397,8 +1397,8 @@ EOF xen=no # Xen unstable - elif ( - cat > $TMPC < $TMPC < #include #include @@ -1418,12 +1418,12 @@ int main(void) { } EOF compile_prog "" "$xen_libs" - ) ; then + then xen_ctrl_version=420 xen=yes - elif ( - cat > $TMPC < $TMPC < #include #include @@ -1442,13 +1442,13 @@ int main(void) { } EOF compile_prog "" "$xen_libs" - ) ; then + then xen_ctrl_version=410 xen=yes # Xen 4.0.0 - elif ( - cat > $TMPC < $TMPC < #include #include @@ -1469,13 +1469,13 @@ int main(void) { } EOF compile_prog "" "$xen_libs" - ) ; then + then xen_ctrl_version=400 xen=yes # Xen 3.4.0 - elif ( - cat > $TMPC < $TMPC < #include int main(void) { @@ -1491,13 +1491,13 @@ int main(void) { } EOF compile_prog "" "$xen_libs" - ) ; then + then xen_ctrl_version=340 xen=yes # Xen 3.3.0 - elif ( - cat > $TMPC < $TMPC < #include int main(void) { @@ -1509,7 +1509,7 @@ int main(void) { } EOF compile_prog "" "$xen_libs" - ) ; then + then xen_ctrl_version=330 xen=yes