merge after backout

This commit is contained in:
Dão Gottwald 2008-08-14 14:11:30 +02:00
commit c906a63b6e

View File

@ -117,13 +117,8 @@ ifeq ($(OS_TEST),mips)
OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
CPU_ARCH = mips
else
ifeq (,$(filter-out i686 i586 i486 i386,$(OS_TEST)))
OS_REL_CFLAGS = -DLINUX1_2 -Di386 -D_XOPEN_SOURCE
CPU_ARCH = x86
else
OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
CPU_ARCH = $(OS_TEST)
endif
endif
endif
endif