Module Name: src
Committed By: tsutsui
Date: Tue Jun 5 13:20:01 UTC 2012
Modified Files:
src/etc: MAKEDEV.tmpl
Log Message:
Invoke MAKEDEV.local via $HOST_SH (default ${HOST_SH:=sh}) instead of
hardcoded "sh" to avoid unexpected errors on cross build hosts in
src/distrib/common/Makefile.makedev etc.
Should fix PR toolchain/46537, ok apb@
To generate a diff of this commit:
cvs rdiff -u -r1.155 -r1.156 src/etc/MAKEDEV.tmpl
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/MAKEDEV.tmpl
diff -u src/etc/MAKEDEV.tmpl:1.155 src/etc/MAKEDEV.tmpl:1.156
--- src/etc/MAKEDEV.tmpl:1.155 Sat May 26 00:36:15 2012
+++ src/etc/MAKEDEV.tmpl Tue Jun 5 13:20:01 2012
@@ -1,5 +1,5 @@
#!/bin/sh -
-# $NetBSD: MAKEDEV.tmpl,v 1.155 2012/05/26 00:36:15 riz Exp $
+# $NetBSD: MAKEDEV.tmpl,v 1.156 2012/06/05 13:20:01 tsutsui Exp $
#
# Copyright (c) 2003,2007,2008 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -421,6 +421,7 @@ setup()
{
PATH=/sbin:/usr/sbin:/bin:/usr/bin:/rescue
+ : ${HOST_SH:=sh}
: ${TOOL_MKNOD:=mknod}
: ${TOOL_MTREE:=mtree}
: ${TOOL_PAX:=pax}
@@ -2092,9 +2093,9 @@ local)
umask 0
if [ -n "$count_nodes" ]; then
count_nodes=$((count_nodes + \
- $(linecount "$(sh "$0.local" $opts -s all)") ))
+ $(linecount "$("$HOST_SH" "$0.local" $opts -s all)") ))
else
- sh "$0.local" $opts all
+ "$HOST_SH" "$0.local" $opts all
fi
umask 077
fi
