Module Name: src
Committed By: christos
Date: Tue Nov 28 22:05:57 UTC 2017
Modified Files:
src/tools/gcc: mknative.common
Log Message:
use make -C path/to -f Makefile instead of make -f path/to/Makefile
so that includes with relative paths work.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/tools/gcc/mknative.common
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/gcc/mknative.common
diff -u src/tools/gcc/mknative.common:1.11 src/tools/gcc/mknative.common:1.12
--- src/tools/gcc/mknative.common:1.11 Mon Feb 17 16:39:43 2014
+++ src/tools/gcc/mknative.common Tue Nov 28 17:05:57 2017
@@ -1,4 +1,4 @@
-# $NetBSD: mknative.common,v 1.11 2014/02/17 21:39:43 christos Exp $
+# $NetBSD: mknative.common,v 1.12 2017/11/28 22:05:57 christos Exp $
#
# from: NetBSD: mknative,v 1.12 2003/03/05 06:17:17 mrg Exp
#
@@ -21,10 +21,12 @@ fi
#
getvars()
{
- _mf="$1"; shift
+ _mfp="$1"; shift
case "$MAKE" in
*gmake)
- env MAKEFLAGS= $MAKE --quiet -f - -f "$_TMPDIR/$_mf" _x_ <<EOF || bomb "getvars $_mf $* failed"
+ _dir=$(dirname "$_TMPDIR/$_mfp")
+ _mf=$(basename "$_TMPDIR/$_mfp")
+ env MAKEFLAGS= $MAKE -C "$_dir" --quiet -f - -f "$_mf" _x_ <<EOF || bomb "getvars $_mf $* failed"
define echo_var
@echo G_\${var}="\${\${var}}" | sed -e 's,\([^\.]\)\./\([a-zA-Z0-9_-]*\.o\),\1\2,g' -e 's,$_VPATH,\$\${GNUHOSTDIST},g' -e 's,$_GNU_DIST,\$\${GNUHOSTDIST},g'
@@ -62,7 +64,7 @@ write_c()
echo '/* This file is automatically generated. DO NOT EDIT! */' >$_TOP/$1.tmp || \
bomb "cannot create $1"
grep '$''NetBSD' $0 | sed 's,[ #$],,g;s,.*,/* Generated from: & */,' >>$_TOP/$1.tmp
- echo '$NetBSD: mknative.common,v 1.11 2014/02/17 21:39:43 christos Exp $' | sed 's,[#$],,g;s,.*,/* Generated from: & */,' >>$_TOP/$1.tmp
+ echo '$NetBSD: mknative.common,v 1.12 2017/11/28 22:05:57 christos Exp $' | sed 's,[#$],,g;s,.*,/* Generated from: & */,' >>$_TOP/$1.tmp
echo '' >>$_TOP/$1.tmp
writefile $1
}
@@ -74,7 +76,7 @@ write_mk()
echo '# This file is automatically generated. DO NOT EDIT!' >$_TOP/$1.tmp || \
bomb "cannot create $1"
grep '$''NetBSD' $0 | sed 's,[ #$],,g;s,.*,# Generated from: &,' >>$_TOP/$1.tmp
- echo '$NetBSD: mknative.common,v 1.11 2014/02/17 21:39:43 christos Exp $' | sed 's,[#$],,g;s,.*,# Generated from: &,' >>$_TOP/$1.tmp
+ echo '$NetBSD: mknative.common,v 1.12 2017/11/28 22:05:57 christos Exp $' | sed 's,[#$],,g;s,.*,# Generated from: &,' >>$_TOP/$1.tmp
echo '#' >>$_TOP/$1.tmp
writefile $1
}
