提交 69deef08 编写于 作者: P Peter Maydell 提交者: Blue Swirl

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: NPeter Maydell <peter.maydell@linaro.org>
Signed-off-by: NBlue Swirl <blauwirbel@gmail.com>
上级 ee785fed
...@@ -1396,8 +1396,8 @@ EOF ...@@ -1396,8 +1396,8 @@ EOF
xen=no xen=no
# Xen unstable # Xen unstable
elif ( elif
cat > $TMPC <<EOF cat > $TMPC <<EOF &&
#include <xenctrl.h> #include <xenctrl.h>
#include <xenstore.h> #include <xenstore.h>
#include <stdint.h> #include <stdint.h>
...@@ -1417,12 +1417,12 @@ int main(void) { ...@@ -1417,12 +1417,12 @@ int main(void) {
} }
EOF EOF
compile_prog "" "$xen_libs" compile_prog "" "$xen_libs"
) ; then then
xen_ctrl_version=420 xen_ctrl_version=420
xen=yes xen=yes
elif ( elif
cat > $TMPC <<EOF cat > $TMPC <<EOF &&
#include <xenctrl.h> #include <xenctrl.h>
#include <xs.h> #include <xs.h>
#include <stdint.h> #include <stdint.h>
...@@ -1441,13 +1441,13 @@ int main(void) { ...@@ -1441,13 +1441,13 @@ int main(void) {
} }
EOF EOF
compile_prog "" "$xen_libs" compile_prog "" "$xen_libs"
) ; then then
xen_ctrl_version=410 xen_ctrl_version=410
xen=yes xen=yes
# Xen 4.0.0 # Xen 4.0.0
elif ( elif
cat > $TMPC <<EOF cat > $TMPC <<EOF &&
#include <xenctrl.h> #include <xenctrl.h>
#include <xs.h> #include <xs.h>
#include <stdint.h> #include <stdint.h>
...@@ -1468,13 +1468,13 @@ int main(void) { ...@@ -1468,13 +1468,13 @@ int main(void) {
} }
EOF EOF
compile_prog "" "$xen_libs" compile_prog "" "$xen_libs"
) ; then then
xen_ctrl_version=400 xen_ctrl_version=400
xen=yes xen=yes
# Xen 3.4.0 # Xen 3.4.0
elif ( elif
cat > $TMPC <<EOF cat > $TMPC <<EOF &&
#include <xenctrl.h> #include <xenctrl.h>
#include <xs.h> #include <xs.h>
int main(void) { int main(void) {
...@@ -1490,13 +1490,13 @@ int main(void) { ...@@ -1490,13 +1490,13 @@ int main(void) {
} }
EOF EOF
compile_prog "" "$xen_libs" compile_prog "" "$xen_libs"
) ; then then
xen_ctrl_version=340 xen_ctrl_version=340
xen=yes xen=yes
# Xen 3.3.0 # Xen 3.3.0
elif ( elif
cat > $TMPC <<EOF cat > $TMPC <<EOF &&
#include <xenctrl.h> #include <xenctrl.h>
#include <xs.h> #include <xs.h>
int main(void) { int main(void) {
...@@ -1508,7 +1508,7 @@ int main(void) { ...@@ -1508,7 +1508,7 @@ int main(void) {
} }
EOF EOF
compile_prog "" "$xen_libs" compile_prog "" "$xen_libs"
) ; then then
xen_ctrl_version=330 xen_ctrl_version=330
xen=yes xen=yes
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册