Diff of /branches/R11-unstable/include/multilib.sminc

Parent Directory | Revision Log | Patch

	revision 20987 by niro, Mon Mar 3 09:56:03 2014 UTC	revision 22068 by niro, Fri Aug 22 13:18:50 2014 UTC
#	Line 295  cmake_configure()	Line 295  cmake_configure()
295	local saved_SRCDIR="${SRCDIR}"	local saved_SRCDIR="${SRCDIR}"
296	for abi in ${abis_to_run}	for abi in ${abis_to_run}
297	do	do
	cd ${BUILDDIR}/build-${abi}
298	SRCDIR="${saved_SRCDIR}-${abi}"	SRCDIR="${saved_SRCDIR}-${abi}"
299		# honor inside and outside build-dir builds
300		if [ -d ${BUILDDIR}/build-${abi} ]
301		then
302		cd ${BUILDDIR}/build-${abi}
303		else
304		cd ${SRCDIR}
305		fi
306	abi-${abi} oldcmake_configure $@ || die	abi-${abi} oldcmake_configure $@ || die
307	done	done
308	# restore SRCDIR	# restore SRCDIR
#	Line 354  cmake_src_check()	Line 360  cmake_src_check()
360
361	for abi in ${abis_to_run}	for abi in ${abis_to_run}
362	do	do
363	cd ${BUILDDIR}/build-${abi}	# honor inside and outside build-dir builds
364		if [ -d ${BUILDDIR}/build-${abi} ]
365		then
366		cd ${BUILDDIR}/build-${abi}
367		else
368		cd ${SRCDIR}-${abi}
369		fi
370	mmake -j1 -k check || die	mmake -j1 -k check || die
371	done	done
372	}	}
#	Line 376  cmake_src_install()	Line 388  cmake_src_install()
388
389	for abi in ${abis_to_run}	for abi in ${abis_to_run}
390	do	do
391	# install build outside of the source dir	# honor inside and outside build-dir builds
392	cd ${BUILDDIR}/build-${abi}	if [ -d ${BUILDDIR}/build-${abi} ]
393		then
394		cd ${BUILDDIR}/build-${abi}
395		else
396		cd ${SRCDIR}-${abi}
397		fi
398	abi-${abi} oldmmake DESTDIR=${BINDIR} $@ install || die	abi-${abi} oldmmake DESTDIR=${BINDIR} $@ install || die
399	done	done
400	}	}

---

Colored Diff Long Colored Diff Full Colored Diff Unidiff Context Diff Side by Side

Legend: Removed from v.20987   changed lines   Added in v.22068