Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
OS-2032 bind should find nm in /usr/bin
OS-2033 illumos-extra install.subr should not reference /usr/ccs for strip OS-2034 libm should find ld, mcs, and strip in /usr
- Loading branch information
Showing
6 changed files
with
46 additions
and
11 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
From f7bd7bb5122a69fae3cdd7bf9cdbb45e7183313f Mon Sep 17 00:00:00 2001 | ||
From: Robert Mustacchi <rm@joyent.com> | ||
Date: Sat, 16 Mar 2013 00:56:04 +0000 | ||
Subject: [PATCH] Fix nm location | ||
|
||
--- | ||
util/mksymtbl.pl | 6 +++++- | ||
1 files changed, 5 insertions(+), 1 deletions(-) | ||
|
||
diff --git a/util/mksymtbl.pl b/util/mksymtbl.pl | ||
index 9908a53..31351f4 100755 | ||
--- a/util/mksymtbl.pl | ||
+++ b/util/mksymtbl.pl | ||
@@ -44,10 +44,14 @@ if ($options{'o'}) { | ||
$nm_prog = "nm"; | ||
$ostype = `uname -s`; | ||
chop($ostype); | ||
-if ($ostype eq "SunOS" || $ostype eq "HP-UX") { | ||
+if ($ostype eq "HP-UX") { | ||
$nm_prog = "/usr/ccs/bin/nm -x" | ||
} | ||
|
||
+if ($ostype eq "SunOS") { | ||
+ $nm_prog = "/usr/bin/nm -x" | ||
+} | ||
+ | ||
if ($options{'i'}) { | ||
open(SYMBOLS, $options{'i'}) || die "failed to open $options{'i'}"; | ||
} else { | ||
-- | ||
1.7.7.2 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters