elwix/build_world.sh - diff

Return to build_world.sh CVS log

Up to [ELWIX - Embedded LightWeight unIX -] / elwix

Diff for /elwix/build_world.sh between versions 1.3 and 1.4

version 1.3, 2014/01/05 23:14:22	version 1.4, 2014/09/15 19:06:42
Line 37 if [ "${USER}" != "root" ]; then	Line 37 if [ "${USER}" != "root" ]; then
exit 1	exit 1
fi	fi

	# Set TARGET_CPUTYPE only for world compiling. Don't use this in kernel build!
	X_TARGET_CPUTYPE="TARGET_CPUTYPE=${TARGET_CPUTYPE}"

clean_world()	clean_world()
{	{
echo "+++ Clean ELWIX World ..."	echo "+++ Clean ELWIX World ..."
Line 51 build_toolchain()	Line 54 build_toolchain()
echo "+++ Build ELWIX Toolchain ..."	echo "+++ Build ELWIX Toolchain ..."
cd $BSDSRC	cd $BSDSRC
env MAKEOBJDIRPREFIX=${BSDOBJ} make ${PARALLEL_BUILD} \	env MAKEOBJDIRPREFIX=${BSDOBJ} make ${PARALLEL_BUILD} \
TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \	TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} ${X_TARGET_CPUTYPE} \
MAKEOBJDIRPREFIX=${BSDOBJ} SRCCONF=${SRCCONF} \	SRCCONF=${SRCCONF} __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} toolchain
DESTDIR=${WORLD} toolchain
if [ $? -eq 0 ]; then	if [ $? -eq 0 ]; then
cd -	cd -
else	else
Line 67 build_world()	Line 69 build_world()
cd $BSDSRC	cd $BSDSRC
if [ -z "$1" ]; then	if [ -z "$1" ]; then
env MAKEOBJDIRPREFIX=${BSDOBJ} make ${PARALLEL_BUILD} \	env MAKEOBJDIRPREFIX=${BSDOBJ} make ${PARALLEL_BUILD} \
TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \	TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} ${X_TARGET_CPUTYPE} \
MAKEOBJDIRPREFIX=${BSDOBJ} SRCCONF=${SRCCONF} buildworld	SRCCONF=${SRCCONF} __MAKE_CONF=${MAKECONF} buildworld
else	else
env MAKEOBJDIRPREFIX=${BSDOBJ} NO_CLEAN="YES" make ${PARALLEL_BUILD} \	env MAKEOBJDIRPREFIX=${BSDOBJ} NO_CLEAN="YES" make ${PARALLEL_BUILD} \
TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \	TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} ${X_TARGET_CPUTYPE} \
MAKEOBJDIRPREFIX=${BSDOBJ} SRCCONF=${SRCCONF} buildworld	SRCCONF=${SRCCONF} __MAKE_CONF=${MAKECONF} buildworld
fi	fi
if [ $? -eq 0 ]; then	if [ $? -eq 0 ]; then
cd -	cd -
Line 86 install_world()	Line 88 install_world()
echo "+++ Install ELWIX World ..."	echo "+++ Install ELWIX World ..."
cd $BSDSRC	cd $BSDSRC
env MAKEOBJDIRPREFIX=${BSDOBJ} make \	env MAKEOBJDIRPREFIX=${BSDOBJ} make \
TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \	TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} ${X_TARGET_CPUTYPE} \
MAKEOBJDIRPREFIX=${BSDOBJ} SRCCONF=${SRCCONF} DESTDIR=${WORLD} installworld	SRCCONF=${SRCCONF} __MAKE_CONF=${MAKECONF} DESTDIR=${WORLD} installworld
cd -	cd -

if [ $? -eq 0 ]; then	if [ $? -eq 0 ]; then
Line 106 build_cross()	Line 108 build_cross()
#	#
export \\	export \\
_EOF	_EOF
make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \	env MAKEOBJDIRPREFIX=${BSDOBJ} make TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} ${X_TARGET_CPUTYPE} \
MAKEOBJDIRPREFIX=${BSDOBJ} buildenvvars >> ${CENV}	buildenvvars >> ${CENV}
cat >>${CENV} <<_EOF	cat >>${CENV} <<_EOF
PATH=$WORLD/elwix/pkg/bin:$WORLD/elwix/pkg/sbin:/elwix/pkg/bin:/elwix/pkg/sbin:$PKG/bin:$PKG/sbin:\$PATH:$PATH	PATH=$WORLD/elwix/pkg/bin:$WORLD/elwix/pkg/sbin:/elwix/pkg/bin:/elwix/pkg/sbin:$PKG/bin:$PKG/sbin:\$PATH:$PATH

	if [ -n "\${REPLACE_MAKEOBJDIRPREFIX}" ]; then
	MAKEOBJDIRPREFIX="\${REPLACE_MAKEOBJDIRPREFIX}"
	fi

_EOF	_EOF
cd -	cd -
cp ${CENV} ${CBUILD}	cp ${CENV} ${CBUILD}

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.3
changed lines
	Added in v.1.4