Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/tools/gcc canonicalise the src dir to /usr/src, so it doesn'...



details:   https://anonhg.NetBSD.org/src/rev/196d64da2676
branches:  trunk
changeset: 806067:196d64da2676
user:      mrg <mrg%NetBSD.org@localhost>
date:      Fri Jan 30 12:23:47 2015 +0000

description:
canonicalise the src dir to /usr/src, so it doesn't matter
where we run mknative.

diffstat:

 tools/gcc/mknative-gcc |  12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diffs (34 lines):

diff -r 10315f80fb6f -r 196d64da2676 tools/gcc/mknative-gcc
--- a/tools/gcc/mknative-gcc    Fri Jan 30 10:21:23 2015 +0000
+++ b/tools/gcc/mknative-gcc    Fri Jan 30 12:23:47 2015 +0000
@@ -1,5 +1,5 @@
 #!/bin/sh
-#      $NetBSD: mknative-gcc,v 1.79 2014/05/29 16:27:50 skrll Exp $
+#      $NetBSD: mknative-gcc,v 1.80 2015/01/30 12:23:47 mrg Exp $
 #
 # Shell script for generating all the constants needed for a native
 # platform build of gcc.
@@ -331,7 +331,7 @@
                write_c $_OUTDIRBASE/usr.bin/$_subdir/arch/$MACHINE_ARCH/$f.h <$_TMPDIR/gcc/$f.h
                if [ "${MACHINE_ARCH}" = "powerpc" -a "${f}" = "configargs" ]
                then
-                       ex <<__EOF__ $_OUTDIRBASE/usr.bin/$_subdir/arch/$MACHINE_ARCH/$f.h
+                       ex <<__EOF__ $_OUTDIR/usr.bin/$_subdir/arch/$MACHINE_ARCH/$f.h
 /configuration_arguments/ s/$//
 ya
 i
@@ -355,6 +355,14 @@
 wq
 __EOF__
                fi
+               if [ "${f}" = "configargs" ]
+               then
+                       _srcquoted=$(echo "$_SRC" | sed 's/\//\\\//g')
+                       ex <<__EOF__ $_OUTDIR/usr.bin/$_subdir/arch/$MACHINE_ARCH/$f.h
+/static const char configuration_arguments/ s/$_srcquoted/\/usr\/src/g
+wq
+__EOF__
+               fi
        done
 
        # keep identical



Home | Main Index | Thread Index | Old Index