[Xen-changelog] [xen-unstable] libfsimage: Revert broken parts of portability changes to the build system.

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1206630835 0
# Node ID ee38b254e98e0f96ac403a9cec39c2bb0b83549a
# Parent  a8328ea7853d7d57d6d9bf6c32ae91f0b02db73e
libfsimage: Revert broken parts of portability changes to the build system.
Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxx>
---
 tools/libfsimage/Makefile        |    2 +-
 tools/libfsimage/check-libext2fs |    6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff -r a8328ea7853d -r ee38b254e98e tools/libfsimage/Makefile
--- a/tools/libfsimage/Makefile Thu Mar 27 14:43:20 2008 +0000
+++ b/tools/libfsimage/Makefile Thu Mar 27 15:13:55 2008 +0000
@@ -2,7 +2,7 @@ include $(XEN_ROOT)/tools/Rules.mk
 include $(XEN_ROOT)/tools/Rules.mk
 
 SUBDIRS-y = common ufs reiserfs iso9660 fat
-SUBDIRS-y += $(shell $(SHELL) env CC="$(CC)" ./check-libext2fs)
+SUBDIRS-y += $(shell env CC="$(CC)" ./check-libext2fs)
 
 .PHONY: all clean install
 all clean install: %: subdirs-%
diff -r a8328ea7853d -r ee38b254e98e tools/libfsimage/check-libext2fs
--- a/tools/libfsimage/check-libext2fs  Thu Mar 27 14:43:20 2008 +0000
+++ b/tools/libfsimage/check-libext2fs  Thu Mar 27 15:13:55 2008 +0000
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 cat >ext2-test.c <<EOF
 #include <ext2fs/ext2fs.h>
@@ -9,9 +9,7 @@ int main()
 }
 EOF
 
-if test -z ${CC}; then CC="gcc"; fi
-${CC} -o ext2-test ext2-test.c -lext2fs >/dev/null 2>&1
-
+${CC-gcc} -o ext2-test ext2-test.c -lext2fs >/dev/null 2>&1
 if [ $? = 0 ]; then
        echo ext2fs-lib
 else

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog