diff --git a/Makefile b/Makefile index 4e7a830..9450450 100644 --- a/Makefile +++ b/Makefile @@ -35,8 +35,9 @@ all: tools.mk docs libemile libblock libiso9660 libiso9660-m68k libgzip-m68k \ libconfig libconfig-m68k \ second/$(KARCH)-linux-all/second second/m68k-linux-scsi-driver/apple_driver -tools.mk: scripts/tools.sh - sh scripts/tools.sh > $@ +tools.mk: + @echo "Please run ./configure" + @false ALL_BIN = cdboot-sarge.bin cdboot-woody.bin cdboot-etch.bin diff --git a/scripts/tools.sh b/configure old mode 100644 new mode 100755 similarity index 68% rename from scripts/tools.sh rename to configure index b76e35b..9bbdd10 --- a/scripts/tools.sh +++ b/configure @@ -13,7 +13,35 @@ WHERE=$(hostname) ARCH=$(uname -m) OS=$(uname -o) -cat < /dev/null 2>&1 + then + M68K_CROSS_COMPILE=m68k-linux-gnu- + if ! type "${M68K_CROSS_COMPILE}${CC}" > /dev/null 2>&1 + then + echo "Cannot find m68k cross-compiler" 1>&2 + unset M68K_CROSS_COMPILE + fi + fi +fi + +if test "${ARCH}" != "ppc" ; then + PPC_CROSS_COMPILE=${PPC_CROSS_COMPILE:-powerpc-linux-} + if ! type "${PPC_CROSS_COMPILE}${CC}" > /dev/null 2>&1 + then + PPC_CROSS_COMPILE=powerpc-linux-gnu- + if ! type "${PPC_CROSS_COMPILE}${CC}" > /dev/null 2>&1 + then + echo "Cannot find powerpc cross-compiler" 1>&2 + unset PPC_CROSS_COMPILE + fi + fi +fi + +exec 5> tools.mk.tmp + +cat 1>&5 < /dev/null 2>&1 - then - M68K_CROSS_COMPILE=m68k-linux-gnu- - if ! type "${M68K_CROSS_COMPILE}${CC}" > /dev/null 2>&1 - then - echo "Cannot find m68k cross-compiler" 1>&2 - fi - fi - M68K_GCC_VERSION=$(${M68K_CROSS_COMPILE}${CC} -dumpversion 2> /dev/null) - echo "cross-compiler is ${M68K_CROSS_COMPILE}${CC} ${M68K_GCC_VERSION}" 1>&2 -fi - -cat < /dev/null 2>&1 - then - PPC_CROSS_COMPILE=powerpc-linux-gnu- - if ! type "${PPC_CROSS_COMPILE}${CC}" > /dev/null 2>&1 - then - echo "Cannot find powerpc cross-compiler" 1>&2 - else - PPC_GCC_VERSION=$(${PPC_CROSS_COMPILE}${CC} -dumpversion 2> /dev/null) - echo "cross-compiler is ${PPC_CROSS_COMPILE}${CC} ${PPC_GCC_VERSION}" 1>&2 -cat < /dev/null) + echo "cross-compiler is ${M68K_CROSS_COMPILE}${CC} ${M68K_GCC_VERSION}" 1>&2 +fi +if [ "${PPC_CROSS_COMPILE}" != "" ] ; then + PPC_GCC_VERSION=$(${PPC_CROSS_COMPILE}${CC} -dumpversion 2> /dev/null) + echo "cross-compiler is ${PPC_CROSS_COMPILE}${CC} ${PPC_GCC_VERSION}" 1>&2 +cat 1>&5 <&5 < /dev/null 2>&1 -then -cat <&5 <&5 < /dev/null 2>&1 then -cat <&5 < \$@ @@ -142,7 +144,7 @@ cat < /dev/null 2>&1 then -cat <&5 < \$@ @@ -151,8 +153,8 @@ cat < \$@ !EOF else - -cat <&5 <&2 && false @@ -161,3 +163,5 @@ cat <