-default_machine='nehalem'
-ok=$(cc -march=$default_machine -E - < /dev/null > /dev/null 2>&1 || echo false)
-if [ "$ok" = "false" ] ; then
- default_machine='corei7'
+generic_isa='nehalem'
+if ! check_cc_flags "-march=$generic_isa" ; then
+ generic_isa='corei7'
+fi
+build build-x86-generic cc skipABI -Dcheck_includes=true \
+ -Dlibdir=lib -Dcpu_instruction_set=$generic_isa $use_shared
+
+# 32-bit with default compiler
+if check_cc_flags '-m32' ; then
+ if [ -d '/usr/lib/i386-linux-gnu' ] ; then
+ # 32-bit pkgconfig on Debian/Ubuntu
+ export PKG_CONFIG_LIBDIR='/usr/lib/i386-linux-gnu/pkgconfig'
+ elif [ -d '/usr/lib32' ] ; then
+ # 32-bit pkgconfig on Arch
+ export PKG_CONFIG_LIBDIR='/usr/lib32/pkgconfig'
+ else
+ # 32-bit pkgconfig on RHEL/Fedora (lib vs lib64)
+ export PKG_CONFIG_LIBDIR='/usr/lib/pkgconfig'
+ fi
+ target_override='i386-pc-linux-gnu'
+ build build-32b cc ABI -Dc_args='-m32' -Dc_link_args='-m32'
+ target_override=
+ unset PKG_CONFIG_LIBDIR