ia64/xen-unstable

changeset 17339:ee38b254e98e

libfsimage: Revert broken parts of portability changes to the build system.
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
author Keir Fraser <keir.fraser@citrix.com>
date Thu Mar 27 15:13:55 2008 +0000 (2008-03-27)
parents a8328ea7853d
children a819cf758b8c
files tools/libfsimage/Makefile tools/libfsimage/check-libext2fs
line diff
     1.1 --- a/tools/libfsimage/Makefile	Thu Mar 27 14:43:20 2008 +0000
     1.2 +++ b/tools/libfsimage/Makefile	Thu Mar 27 15:13:55 2008 +0000
     1.3 @@ -2,7 +2,7 @@ XEN_ROOT = ../..
     1.4  include $(XEN_ROOT)/tools/Rules.mk
     1.5  
     1.6  SUBDIRS-y = common ufs reiserfs iso9660 fat
     1.7 -SUBDIRS-y += $(shell $(SHELL) env CC="$(CC)" ./check-libext2fs)
     1.8 +SUBDIRS-y += $(shell env CC="$(CC)" ./check-libext2fs)
     1.9  
    1.10  .PHONY: all clean install
    1.11  all clean install: %: subdirs-%
     2.1 --- a/tools/libfsimage/check-libext2fs	Thu Mar 27 14:43:20 2008 +0000
     2.2 +++ b/tools/libfsimage/check-libext2fs	Thu Mar 27 15:13:55 2008 +0000
     2.3 @@ -1,4 +1,4 @@
     2.4 -#!/bin/sh
     2.5 +#!/bin/bash
     2.6  
     2.7  cat >ext2-test.c <<EOF
     2.8  #include <ext2fs/ext2fs.h>
     2.9 @@ -9,9 +9,7 @@ int main()
    2.10  }
    2.11  EOF
    2.12  
    2.13 -if test -z ${CC}; then CC="gcc"; fi
    2.14 -${CC} -o ext2-test ext2-test.c -lext2fs >/dev/null 2>&1
    2.15 -
    2.16 +${CC-gcc} -o ext2-test ext2-test.c -lext2fs >/dev/null 2>&1
    2.17  if [ $? = 0 ]; then
    2.18  	echo ext2fs-lib
    2.19  else