socsvn commit: r269651 - soc2014/op/tools

[op at FreeBSD.org]

Author: op
Date: Mon Jun 16 21:50:35 2014
New Revision: 269651
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=269651

Log:
  optimize build scripts ...
  
  Signed-off-by: Oliver Pinter <oliver.pntr at gmail.com>
  
  

Modified:
  soc2014/op/tools/build_kernel_32bit.csh
  soc2014/op/tools/build_kernel_64bit.csh

Modified: soc2014/op/tools/build_kernel_32bit.csh
==============================================================================
--- soc2014/op/tools/build_kernel_32bit.csh	Mon Jun 16 21:43:02 2014	(r269650)
+++ soc2014/op/tools/build_kernel_32bit.csh	Mon Jun 16 21:50:35 2014	(r269651)
@@ -8,7 +8,7 @@
 set current_dir = `pwd`
 set _current_dir = `echo ${current_dir} | sed -e 's|\(.*/\)\(.*\.git\)\(/.*\)*|\2|g'`
 set _current_realdir = `echo ${current_dir} | sed -e 's|\(.*/\)\(.*\.git\)\(/.*\)*|\1/\2|g'`
-set _check_toolchain = "${MAKEOBJDIRPREFIX}/${TARGET}.${TARGET_ARCH}/${_current_realdir}/tmp/usr/include/clang"
+set _check_toolchain = "${MAKEOBJDIRPREFIX}/___kernel-toolchain_DONE"
 set _date=`date "+%Y%m%d%H%M%S"`
 
 if ( "`sysctl -n security.bsd.hardlink_check_uid`" == "1" ) then
@@ -36,8 +36,9 @@
 	mkdir $MAKEOBJDIRPREFIX
 endif
 
-if ( ! -d ${_check_toolchain} ) then
-	(cd /usr/data/source/git/opBSD/${_current_dir}; make -j$__freebsd_mk_jobs -DNO_ROOT KERNCONF=GENERIC kernel-toolchain) |& tee /tmp/cc-log-${_current_dir}-${_date}
+if ( ! -f ${_check_toolchain} ) then
+	(cd /usr/data/source/git/opBSD/${_current_dir}; make -j$__freebsd_mk_jobs -DNO_ROOT KERNCONF=GENERIC kernel-toolchain) |& tee /tmp/cc-log-${_current_dir}-${_date} || exit
+	touch ${_check_toolchain}
 else
 	echo "skip make kernel-toolchain"
 	sleep 1

Modified: soc2014/op/tools/build_kernel_64bit.csh
==============================================================================
--- soc2014/op/tools/build_kernel_64bit.csh	Mon Jun 16 21:43:02 2014	(r269650)
+++ soc2014/op/tools/build_kernel_64bit.csh	Mon Jun 16 21:50:35 2014	(r269651)
@@ -6,7 +6,7 @@
 set current_dir = `pwd`
 set _current_dir = `echo ${current_dir} | sed -e 's|\(.*/\)\(.*\.git\)\(/.*\)*|\2|g'`
 set _current_realdir = `echo ${current_dir} | sed -e 's|\(.*/\)\(.*\.git\)\(/.*\)*|\1/\2|g'`
-set _check_toolchain = "${MAKEOBJDIRPREFIX}/${_current_realdir}/tmp/usr/include/clang"
+set _check_toolchain = "${MAKEOBJDIRPREFIX}/___kernel-toolchain_DONE"
 set _date=`date "+%Y%m%d%H%M%S"`
 
 if ( "`sysctl -n security.bsd.hardlink_check_uid`" == "1" ) then
@@ -34,8 +34,9 @@
 	mkdir $MAKEOBJDIRPREFIX
 endif
 
-if ( ! -d ${_check_toolchain} ) then
-	(cd /usr/data/source/git/opBSD/${_current_dir}; make -j$__freebsd_mk_jobs -DNO_ROOT KERNCONF=GENERIC kernel-toolchain) |& tee /tmp/cc-log-${_current_dir}-${_date}
+if ( ! -f ${_check_toolchain} ) then
+	(cd /usr/data/source/git/opBSD/${_current_dir}; make -j$__freebsd_mk_jobs -DNO_ROOT KERNCONF=GENERIC kernel-toolchain) |& tee /tmp/cc-log-${_current_dir}-${_date} || exit
+	touch ${_check_toolchain}
 else
 	echo "skip make kernel-toolchain"
 	sleep 1