aboutsummaryrefslogtreecommitdiffstats
path: root/tools/libfsimage
diff options
context:
space:
mode:
authorKeir Fraser <keir.fraser@citrix.com>2008-03-27 15:13:55 +0000
committerKeir Fraser <keir.fraser@citrix.com>2008-03-27 15:13:55 +0000
commit3b01829e42fd9f10c13395c51610d2bf862ee979 (patch)
tree4c00c220da809e771f71e7103019b89a24f636ca /tools/libfsimage
parent0665949f3ec56667cfa25456d00d4e8244277e1e (diff)
downloadxen-3b01829e42fd9f10c13395c51610d2bf862ee979.tar.gz
xen-3b01829e42fd9f10c13395c51610d2bf862ee979.tar.bz2
xen-3b01829e42fd9f10c13395c51610d2bf862ee979.zip
libfsimage: Revert broken parts of portability changes to the build system.
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
Diffstat (limited to 'tools/libfsimage')
-rw-r--r--tools/libfsimage/Makefile2
-rwxr-xr-xtools/libfsimage/check-libext2fs6
2 files changed, 3 insertions, 5 deletions
diff --git a/tools/libfsimage/Makefile b/tools/libfsimage/Makefile
index b72e51895a..7dd3c4f0fb 100644
--- a/tools/libfsimage/Makefile
+++ b/tools/libfsimage/Makefile
@@ -2,7 +2,7 @@ XEN_ROOT = ../..
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 --git a/tools/libfsimage/check-libext2fs b/tools/libfsimage/check-libext2fs
index b6fa7fbacd..3c79fb0553 100755
--- a/tools/libfsimage/check-libext2fs
+++ b/tools/libfsimage/check-libext2fs
@@ -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