diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2012-08-02 18:30:26 +0100 |
|---|---|---|
| committer | Blue Swirl <blauwirbel@gmail.com> | 2012-08-04 13:25:04 +0000 |
| commit | 69deef089db0d2eb94b7adc6d6ac78a1cf0d5511 (patch) | |
| tree | 4e5a08174bcd94e3c4bcefb51ba42d3cbbb111f2 | |
| parent | ee785fed5dd035d4b12142cacec6d3c344426dec (diff) | |
| download | qemu-69deef089db0d2eb94b7adc6d6ac78a1cf0d5511.zip qemu-69deef089db0d2eb94b7adc6d6ac78a1cf0d5511.tar.gz qemu-69deef089db0d2eb94b7adc6d6ac78a1cf0d5511.tar.bz2 | |
configure: Don't run Xen compile checks in subshells
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 <peter.maydell@linaro.org>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
| -rwxr-xr-x | configure | 30 |
1 files changed, 15 insertions, 15 deletions
@@ -1396,8 +1396,8 @@ EOF xen=no # Xen unstable - elif ( - cat > $TMPC <<EOF + elif + cat > $TMPC <<EOF && #include <xenctrl.h> #include <xenstore.h> #include <stdint.h> @@ -1417,12 +1417,12 @@ int main(void) { } EOF compile_prog "" "$xen_libs" - ) ; then + then xen_ctrl_version=420 xen=yes - elif ( - cat > $TMPC <<EOF + elif + cat > $TMPC <<EOF && #include <xenctrl.h> #include <xs.h> #include <stdint.h> @@ -1441,13 +1441,13 @@ int main(void) { } EOF compile_prog "" "$xen_libs" - ) ; then + then xen_ctrl_version=410 xen=yes # Xen 4.0.0 - elif ( - cat > $TMPC <<EOF + elif + cat > $TMPC <<EOF && #include <xenctrl.h> #include <xs.h> #include <stdint.h> @@ -1468,13 +1468,13 @@ int main(void) { } EOF compile_prog "" "$xen_libs" - ) ; then + then xen_ctrl_version=400 xen=yes # Xen 3.4.0 - elif ( - cat > $TMPC <<EOF + elif + cat > $TMPC <<EOF && #include <xenctrl.h> #include <xs.h> int main(void) { @@ -1490,13 +1490,13 @@ int main(void) { } EOF compile_prog "" "$xen_libs" - ) ; then + then xen_ctrl_version=340 xen=yes # Xen 3.3.0 - elif ( - cat > $TMPC <<EOF + elif + cat > $TMPC <<EOF && #include <xenctrl.h> #include <xs.h> int main(void) { @@ -1508,7 +1508,7 @@ int main(void) { } EOF compile_prog "" "$xen_libs" - ) ; then + then xen_ctrl_version=330 xen=yes |