Module Name: src
Committed By: christos
Date: Wed Nov 29 03:32:28 UTC 2017
Modified Files:
src/tools/gcc: mknative.common
Log Message:
Be more selective about what to quote-quote: only paths and version numbers.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 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.14 src/tools/gcc/mknative.common:1.15
--- src/tools/gcc/mknative.common:1.14 Tue Nov 28 22:06:46 2017
+++ src/tools/gcc/mknative.common Tue Nov 28 22:32:28 2017
@@ -1,4 +1,4 @@
-# $NetBSD: mknative.common,v 1.14 2017/11/29 03:06:46 christos Exp $
+# $NetBSD: mknative.common,v 1.15 2017/11/29 03:32:28 christos Exp $
#
# from: NetBSD: mknative,v 1.12 2003/03/05 06:17:17 mrg Exp
#
@@ -28,7 +28,7 @@ getvars()
_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' -e 's/"/\\\\"/g' -e "s/'/"'\\\\"/g'
+ @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' -e 's@"\\([A-Za-z0-9_./]*\\)"@\\\\"\\1\\\\"@g' -e "s@'"'\\([A-Za-z0-9./]*\\)'"'"'@\\\\"\\1\\\\"@g'
endef
@@ -65,7 +65,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.14 2017/11/29 03:06:46 christos Exp $' | sed 's,[#$],,g;s,.*,/* Generated from: & */,' >>$_TOP/$1.tmp
+ echo '$NetBSD: mknative.common,v 1.15 2017/11/29 03:32:28 christos Exp $' | sed 's,[#$],,g;s,.*,/* Generated from: & */,' >>$_TOP/$1.tmp
echo '' >>$_TOP/$1.tmp
writefile $1
}
@@ -77,7 +77,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.14 2017/11/29 03:06:46 christos Exp $' | sed 's,[#$],,g;s,.*,# Generated from: &,' >>$_TOP/$1.tmp
+ echo '$NetBSD: mknative.common,v 1.15 2017/11/29 03:32:28 christos Exp $' | sed 's,[#$],,g;s,.*,# Generated from: &,' >>$_TOP/$1.tmp
echo '#' >>$_TOP/$1.tmp
writefile $1
}
