From 70087ad34e224a679eb83e405bf394606ba94c1c Mon Sep 17 00:00:00 2001
From: Richard Lowe <richlowe@richlowe.net>
Date: Tue, 23 Oct 2012 12:58:35 -0400
Subject: 3298 illumos link-editor and related tools should be differentiable
 Reviewed by: Joshua M. Clulow <josh@sysmgr.org> Reviewed by: Dan McDonald
 <danmcd@nexenta.com> Approved by: Garrett D'Amore <garrett@damore.org>

---
 usr/src/cmd/sgs/libconv/common/bld_vernote.ksh | 11 +++++------
 usr/src/tools/scripts/nightly.sh               |  2 +-
 2 files changed, 6 insertions(+), 7 deletions(-)

(limited to 'usr/src')

diff --git a/usr/src/cmd/sgs/libconv/common/bld_vernote.ksh b/usr/src/cmd/sgs/libconv/common/bld_vernote.ksh
index d8f29a05d6..1ca0564379 100644
--- a/usr/src/cmd/sgs/libconv/common/bld_vernote.ksh
+++ b/usr/src/cmd/sgs/libconv/common/bld_vernote.ksh
@@ -19,8 +19,7 @@
 #
 # CDDL HEADER END
 #
-#
-# ident	"%Z%%M%	%I%	%E% SMI"
+
 #
 # Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
@@ -46,7 +45,7 @@ pad_notestring()
 
 build_sparcnote()
 {
-	notestring="Solaris Link Editors: $release-$revision\0"
+	notestring="Solaris Link Editors: $release-$revision (illumos)\0"
 	#
 	# The 'adjustment' is for the '\0'
 	#
@@ -69,14 +68,14 @@ cat > $notefile <<EOF
 	.global		link_ver_string
 link_ver_string:
 	.type		link_ver_string, #object
-	.ascii	"${release}-${revision}\0"
+	.ascii	"${release}-${revision} (illumos)\0"
 	.size	link_ver_string, .-link_ver_string
 EOF
 }
 
 build_i386note()
 {
-	notestring="Solaris Link Editors: $release-$revision"
+	notestring="Solaris Link Editors: $release-$revision (illumos)"
 	#
 	# The 'adjustment' is for the the fact that the x86/amd64
 	# assembler automatically append a '\0' at the end of a string.
@@ -99,7 +98,7 @@ cat > $notefile <<EOF
 	.globl		link_ver_string
 link_ver_string:
 	.type	link_ver_string,@object
-	.string	"${release}-${revision}\0"
+	.string	"${release}-${revision} (illumos)\0"
 	.size	link_ver_string, .-link_ver_string
 EOF
 }
diff --git a/usr/src/tools/scripts/nightly.sh b/usr/src/tools/scripts/nightly.sh
index a7af995caa..8d52a1f7c1 100644
--- a/usr/src/tools/scripts/nightly.sh
+++ b/usr/src/tools/scripts/nightly.sh
@@ -2582,7 +2582,7 @@ echo | tee -a $build_environ_file >> $LOGFILE
 whence ld | tee -a $build_environ_file >> $LOGFILE
 LDVER=`ld -V 2>&1`
 echo $LDVER | tee -a $build_environ_file >> $LOGFILE
-LDVER=`echo $LDVER | sed -e "s/.*-1\.//" -e "s/:.*//"`
+LDVER=`echo $LDVER | sed -e "s/.*-1\.\([0-9]*\).*/\1/"`
 if [ `expr $LDVER \< 422` -eq 1 ]; then
 	echo "The link-editor needs to be at version 422 or higher to build" | \
 	    tee -a $build_environ_file >> $LOGFILE
-- 
cgit v1.2.3