[commit: ghc] ghc-8.0: deriveConstants: Fix nm-classic error message (ec5ddb6)

git at git.haskell.org git at git.haskell.org
Tue May 3 19:24:25 UTC 2016


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

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

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

commit ec5ddb64558ae8b039d24f10a1d33cf5716d6777
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Sun Apr 24 11:31:51 2016 +0200

    deriveConstants: Fix nm-classic error message
    
    Thanks to George Colpitts for the suggestion.
    
    (cherry picked from commit 28503fe984dbc00f687f0579967d583eebb9afcb)


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

ec5ddb64558ae8b039d24f10a1d33cf5716d6777
 utils/deriveConstants/Main.hs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/utils/deriveConstants/Main.hs b/utils/deriveConstants/Main.hs
index 96da166..6a050d3 100644
--- a/utils/deriveConstants/Main.hs
+++ b/utils/deriveConstants/Main.hs
@@ -691,7 +691,10 @@ getWanted verbose os tmpdir gccProgram gccFlags nmProgram mobjdumpProgram
              Just 292   -> return () -- OK
              Nothing    -> die "CONTROL_GROUP_CONST_291 missing!"
              Just 0x292 -> die $ "broken 'nm' detected, see https://ghc.haskell.org/ticket/11744.\n"
-                              ++ "Workaround: You may want to pass '--with-nm=nm-classic' to 'configure'."
+                              ++ "\n"
+                              ++ "Workaround: You may want to pass\n"
+                              ++ "    --with-nm=$(xcode-select -p)/Toolchains/XcodeDefault.xctoolchain/usr/bin/nm-classic\n"
+                              ++ "to 'configure'.\n"
              Just x     -> die ("unexpected value round-tripped for CONTROL_GROUP_CONST_291: " ++ show x)
 
          rs <- mapM (lookupResult m) (wanteds os)



More information about the ghc-commits mailing list