[commit: ghc] ghc-8.0: Recommend more reliable recourse for broken nm (91eeb12)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : ghc-8.0
Link       : http://ghc.haskell.org/trac/ghc/changeset/91eeb121ff23ed657876137a657994a2f986c321/ghc

>---------------------------------------------------------------

commit 91eeb121ff23ed657876137a657994a2f986c321
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Thu Apr 28 10:11:13 2016 +0200

    Recommend more reliable recourse for broken nm
    
    xcrun --find seems like the appropriate choice here. Thanks to Brandon
    Allbery for suggesting this.
    
    (cherry picked from commit a0e10510c64182c7126ff426127ea8fd78c07d00)


>---------------------------------------------------------------

91eeb121ff23ed657876137a657994a2f986c321
 docs/users_guide/8.0.1-notes.rst | 3 +--
 utils/deriveConstants/Main.hs    | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/docs/users_guide/8.0.1-notes.rst b/docs/users_guide/8.0.1-notes.rst
index 5f88037..aa120f7 100644
--- a/docs/users_guide/8.0.1-notes.rst
+++ b/docs/users_guide/8.0.1-notes.rst
@@ -24,8 +24,7 @@ performance improvements over the 7.10 branch.
     system to use the ``nm-classic`` command instead of Apple's new ``nm``
     implementation as the latter breaks POSIX compliance (see
     :ghc-ticket:`11744`). This can be done by passing something like
-    ``--with-nm=/Library/Developer/CommandLineTools/usr/bin/nm-classic`` to
-    ``configure``.
+    ``--with-nm=$(xcrun --find nm-classic)`` to ``configure``.
 
 Highlights
 ----------
diff --git a/utils/deriveConstants/Main.hs b/utils/deriveConstants/Main.hs
index 6a050d3..6cd48d4 100644
--- a/utils/deriveConstants/Main.hs
+++ b/utils/deriveConstants/Main.hs
@@ -693,7 +693,7 @@ getWanted verbose os tmpdir gccProgram gccFlags nmProgram mobjdumpProgram
              Just 0x292 -> die $ "broken 'nm' detected, see https://ghc.haskell.org/ticket/11744.\n"
                               ++ "\n"
                               ++ "Workaround: You may want to pass\n"
-                              ++ "    --with-nm=$(xcode-select -p)/Toolchains/XcodeDefault.xctoolchain/usr/bin/nm-classic\n"
+                              ++ "    --with-nm=$(xcrun --find nm-classic\n"
                               ++ "to 'configure'.\n"
              Just x     -> die ("unexpected value round-tripped for CONTROL_GROUP_CONST_291: " ++ show x)