Source-Changes-HG archive

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

[src/trunk]: src/sys/arch Adjust paths to ${KERNLDSCRIPT} files so that depen...



details:   https://anonhg.NetBSD.org/src/rev/cc9177389fcf
branches:  trunk
changeset: 339960:cc9177389fcf
user:      uebayasi <uebayasi%NetBSD.org@localhost>
date:      Tue Aug 18 10:00:11 2015 +0000

description:
Adjust paths to ${KERNLDSCRIPT} files so that dependency is resolved.

diffstat:

 sys/arch/sparc/conf/Makefile.sparc     |  6 +++---
 sys/arch/sparc64/conf/Makefile.sparc64 |  8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diffs (45 lines):

diff -r 2f0e7dcd1d2a -r cc9177389fcf sys/arch/sparc/conf/Makefile.sparc
--- a/sys/arch/sparc/conf/Makefile.sparc        Tue Aug 18 09:53:33 2015 +0000
+++ b/sys/arch/sparc/conf/Makefile.sparc        Tue Aug 18 10:00:11 2015 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.sparc,v 1.91 2015/08/18 08:39:12 uebayasi Exp $
+#      $NetBSD: Makefile.sparc,v 1.92 2015/08/18 10:00:11 uebayasi Exp $
 
 # Makefile for NetBSD
 #
@@ -60,9 +60,9 @@
 ##
 TEXTADDR?=     F0004000
 EXTRA_LINKFLAGS=       -X
-KERNLDSCRIPT?= kern.ldscript
+KERNLDSCRIPT?= ${SPARC}/conf/kern.ldscript
 LINKFORMAT=    -n
-LINKSCRIPT=    -T ${SPARC}/conf/${KERNLDSCRIPT}
+LINKSCRIPT=    -T ${KERNLDSCRIPT}
 
 ##
 ## (6) port specific target dependencies
diff -r 2f0e7dcd1d2a -r cc9177389fcf sys/arch/sparc64/conf/Makefile.sparc64
--- a/sys/arch/sparc64/conf/Makefile.sparc64    Tue Aug 18 09:53:33 2015 +0000
+++ b/sys/arch/sparc64/conf/Makefile.sparc64    Tue Aug 18 10:00:11 2015 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.sparc64,v 1.76 2015/08/18 08:39:12 uebayasi Exp $
+#      $NetBSD: Makefile.sparc64,v 1.77 2015/08/18 10:00:11 uebayasi Exp $
 
 #=========================================================================
 #
@@ -108,11 +108,11 @@
 ## (5) link settings
 ##
 TEXTADDR?=     01000000
-LINKSCRIPT=    -T ${SPARC64}/conf/${KERNLDSCRIPT}
+LINKSCRIPT=    -T ${KERNLDSCRIPT}
 .if ${LP64} == "yes"
-KERNLDSCRIPT?= kern.ldscript
+KERNLDSCRIPT?= ${SPARC64}/conf/kern.ldscript
 .else
-KERNLDSCRIPT?= kern32.ldscript
+KERNLDSCRIPT?= ${SPARC64}/conf/kern32.ldscript
 .endif
 
 ##



Home | Main Index | Thread Index | Old Index