From owner-svn-soc-all@FreeBSD.ORG  Mon Jun 16 21:50:36 2014
Return-Path: <owner-svn-soc-all@FreeBSD.ORG>
Delivered-To: svn-soc-all@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 76344394
 for <svn-soc-all@FreeBSD.org>; Mon, 16 Jun 2014 21:50:36 +0000 (UTC)
Received: from socsvn.freebsd.org (socsvn.freebsd.org
 [IPv6:2001:1900:2254:206a::50:2])
 (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 57A222224
 for <svn-soc-all@FreeBSD.org>; Mon, 16 Jun 2014 21:50:36 +0000 (UTC)
Received: from socsvn.freebsd.org ([127.0.1.124])
 by socsvn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5GLoabt026016
 for <svn-soc-all@FreeBSD.org>; Mon, 16 Jun 2014 21:50:36 GMT
 (envelope-from op@FreeBSD.org)
Received: (from www@localhost)
 by socsvn.freebsd.org (8.14.8/8.14.8/Submit) id s5GLoZg1026011
 for svn-soc-all@FreeBSD.org; Mon, 16 Jun 2014 21:50:35 GMT
 (envelope-from op@FreeBSD.org)
Date: Mon, 16 Jun 2014 21:50:35 GMT
Message-Id: <201406162150.s5GLoZg1026011@socsvn.freebsd.org>
X-Authentication-Warning: socsvn.freebsd.org: www set sender to op@FreeBSD.org
 using -f
From: op@FreeBSD.org
To: svn-soc-all@FreeBSD.org
Subject: socsvn commit: r269651 - soc2014/op/tools
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-soc-all@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the entire Summer of Code repository
 <svn-soc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-soc-all/>
List-Post: <mailto:svn-soc-all@freebsd.org>
List-Help: <mailto:svn-soc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 16 Jun 2014 21:50:36 -0000

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@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