From 18aa85857ca8fa9d75d41c36665a1cb7e8bbda5c Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 8 Jan 2011 19:56:21 +0100 Subject: variable name cleanup --- Makefile | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 9c08dc134..d7b0e9f1b 100644 --- a/Makefile +++ b/Makefile @@ -191,20 +191,9 @@ NO_ERROR=0 echo "GMAKE:=$$(which gmake)" >>prereq.mk ;\ fi @echo "GNU_HOST_NAME:=$$(${CC} -dumpmachine)" >>prereq.mk - @echo "HOST_ARCH:=$$(${CC} -dumpmachine | sed -e s'/-.*//' \ - -e 's/sparc.*/sparc/' \ - -e 's/arm.*/arm/g' \ - -e 's/m68k.*/m68k/' \ - -e 's/ppc/powerpc/g' \ - -e 's/v850.*/v850/g' \ - -e 's/sh[234]/sh/' \ - -e 's/mips-.*/mips/' \ - -e 's/mipsel-.*/mipsel/' \ - -e 's/cris.*/cris/' \ - -e 's/i[3-9]86/i386/' \ - )" >>prereq.mk @echo "HOSTARCH:=$$(${CC} -dumpmachine | sed -e s'/-.*//' \ -e 's/sparc.*/sparc/' \ + -e 's/armeb.*/armeb/g' \ -e 's/arm.*/arm/g' \ -e 's/m68k.*/m68k/' \ -e 's/v850.*/v850/g' \ @@ -215,11 +204,7 @@ NO_ERROR=0 -e 's/i[3-9]86/x86/' \ )" >>prereq.mk @echo 'HOSTCC:=${CC}' >>prereq.mk - @echo 'HOSTCFLAGS:=-O2' >>prereq.mk @echo 'HOSTCXX:=${CXX}' >>prereq.mk - @echo 'HOSTCXXFLAGS:=-O2' >>prereq.mk - @echo "HOST_LIBIDL_CONFIG:=$$(which libIDL-config-2 2>/dev/null)" >>prereq.mk - @echo "PKG_HOSTLIB_DIR:=$$(pkg-config --variable pc_path pkg-config 2>/dev/null)" >>prereq.mk @echo 'LANGUAGE:=C' >>prereq.mk @echo 'LC_ALL:=C' >>prereq.mk @echo 'MAKE:=$${GMAKE}' >>prereq.mk @@ -228,6 +213,8 @@ NO_ERROR=0 @echo "_PATH:=$$PATH" >>prereq.mk @echo "PATH:=\$${TOPDIR}/scripts:/usr/sbin:$$PATH" >>prereq.mk @echo "SHELL:=$$(which bash)" >>prereq.mk + @echo "HOST_LIBIDL_CONFIG:=$$(which libIDL-config-2 2>/dev/null)" >>prereq.mk + @echo "PKG_HOSTLIB_DIR:=$$(pkg-config --variable pc_path pkg-config 2>/dev/null)" >>prereq.mk @env NO_ERROR=${NO_ERROR} BASH="$$(which bash)" \ CC='${CC}' CPPFLAGS='${CPPFLAGS}' \ bash scripts/scan-tools.sh -- cgit v1.2.3