--- elwix/build_tools.sh 2014/01/15 08:44:56 1.6.6.2 +++ elwix/build_tools.sh 2014/01/15 09:09:44 1.6.6.3 @@ -5,7 +5,7 @@ # (C) AITNET ltd - Sofia/Bulgaria # by Michael Pounov # -# $Id: build_tools.sh,v 1.6.6.2 2014/01/15 08:44:56 misho Exp $ +# $Id: build_tools.sh,v 1.6.6.3 2014/01/15 09:09:44 misho Exp $ # [ -r ./config/rc.elwix ] && . ./config/rc.elwix @@ -21,6 +21,8 @@ unset INSTALL unset VERSION VERSION="$V" +# Set TARGET_CPUTYPE only for world compiling. Don't use this in kernel build! +X_TARGET_CPUTYPE="${TARGET_CPUTYPE}" if [ ! -d $BSDSRC ]; then echo @@ -120,65 +122,65 @@ compile_fbsdtools() cd $CROSS_FT_VIMAGE env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ - __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} clean + ${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} clean env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ - __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} + ${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ - __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} install + ${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} install cd - cd $CROSS_FT_ATH env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ - __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} clean + ${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} clean env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ - __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} + ${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ - __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} install + ${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} install cd - cd $CROSS_FT_IPW env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ - __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} clean + ${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} clean env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ - __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} + ${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ - __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD}/usr/local/bin install + ${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD}/usr/local/bin install cd - cd $CROSS_FT_IWI env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ - __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} clean + ${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} clean env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ - __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} + ${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ - __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD}/usr/local/bin install + ${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD}/usr/local/bin install cd - cd $CROSS_FT_MWL env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ - __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} clean + ${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} clean env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ - __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} + ${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ - __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} install + ${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} install cd - # cd $CROSS_FT_NET80211 # env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ -# __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} clean +# ${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} clean # env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ -# __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} +# ${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} # env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ -# __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} install +# ${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} install # cd - # cd $CROSS_FT_WTAP # env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ -# __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} clean +# ${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} clean # env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ -# __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} +# ${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} # env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ -# __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} install +# ${X_TARGET_CPUTYPE} __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} install # cd - } @@ -186,19 +188,19 @@ compile_files() { cd files env MAKEOBJDIRPREFIX=${BSDOBJ} make \ - TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ + TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} ${X_TARGET_CPUTYPE} \ __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} clean env MAKEOBJDIRPREFIX=${BSDOBJ} make \ - TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ + TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} ${X_TARGET_CPUTYPE} \ __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} obj env MAKEOBJDIRPREFIX=${BSDOBJ} make \ - TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ + TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} ${X_TARGET_CPUTYPE} \ __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} depend env MAKEOBJDIRPREFIX=${BSDOBJ} make \ - TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ + TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} ${X_TARGET_CPUTYPE} \ __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} env MAKEOBJDIRPREFIX=${BSDOBJ} make \ - TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ + TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} ${X_TARGET_CPUTYPE} \ __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} install cd -