Mercurial > illumos > illumos-gate
changeset 13874:cab67b95c26b
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>
| author | Richard Lowe <richlowe@richlowe.net> |
|---|---|
| date | Tue, 23 Oct 2012 12:58:35 -0400 |
| parents | 89c188fb29f6 |
| children | f128a109e6d2 |
| files | usr/src/cmd/sgs/libconv/common/bld_vernote.ksh usr/src/tools/scripts/nightly.sh |
| diffstat | 2 files changed, 6 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/usr/src/cmd/sgs/libconv/common/bld_vernote.ksh Sun Oct 07 05:32:30 2012 +0000 +++ b/usr/src/cmd/sgs/libconv/common/bld_vernote.ksh Tue Oct 23 12:58:35 2012 -0400 @@ -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 @@ 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 @@ .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 @@ .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 }
--- a/usr/src/tools/scripts/nightly.sh Sun Oct 07 05:32:30 2012 +0000 +++ b/usr/src/tools/scripts/nightly.sh Tue Oct 23 12:58:35 2012 -0400 @@ -2582,7 +2582,7 @@ 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