diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-28 20:56:44 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-28 20:56:44 +0100 |
| commit | 2c8917958da115704507aab835c41c1a4a63664d (patch) | |
| tree | e79c26b6347e2ae8444bcdbce1236cc48f63107e /Makefile | |
| parent | cf5ef7c683fa845a6e6412b319e0a1040aa0f445 (diff) | |
| parent | cd83ced050a5d68c922a0de054ac022cd4ff26ac (diff) | |
resolve conflict
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 1 insertions, 3 deletions
@@ -191,7 +191,7 @@ NO_ERROR=0 echo "GMAKE:=$$(which gmake)" >>prereq.mk ;\ fi @echo "GNU_HOST_NAME:=$$(${CC} -dumpmachine)" >>prereq.mk - @echo "HOSTARCH:=$$(${CC} -dumpmachine | sed -e s'/-.*//' \ + @echo "ARCH_FOR_BUILD:=$$(${CC} -dumpmachine | sed -e s'/-.*//' \ -e 's/sparc.*/sparc/' \ -e 's/armeb.*/armeb/g' \ -e 's/arm.*/arm/g' \ @@ -205,8 +205,6 @@ NO_ERROR=0 )" >>prereq.mk @echo 'CC_FOR_BUILD:=${CC}' >>prereq.mk @echo 'CXX_FOR_BUILD:=${CXX}' >>prereq.mk - @echo 'HOSTCC:=${CC}' >>prereq.mk - @echo 'HOSTCXX:=${CXX}' >>prereq.mk @echo 'LANGUAGE:=C' >>prereq.mk @echo 'LC_ALL:=C' >>prereq.mk @echo 'MAKE:=$${GMAKE}' >>prereq.mk |