linking: Don't use --ghc-option=-optl-lm, use extra-libraries: m in…

…stead. Fixes ld.gold: fatal error: cannot mix -r with dynamic object error for dynamic linking. See NixOS/nixpkgs#24692 (comment)
input-output-hk · Jul 21, 2017 · 8f81fb0 · 8f81fb0
1 parent 3740762
commit 8f81fb0
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 2 deletions.
diff --git a/cardano-sl.cabal b/cardano-sl.cabal
@@ -524,6 +524,8 @@ executable cardano-node
   if os(linux)
     ghc-options:       -optl-fuse-ld=gold
     ld-options:        -fuse-ld=gold
+  -- ld.gold needs these explicitly
+  extra-libraries:     m
 
   default-extensions:   DeriveDataTypeable
                         DeriveGeneric

diff --git a/default.nix b/default.nix
@@ -21,8 +21,6 @@ in ((import ./pkgs { inherit pkgs; }).override {
         "-f-asserts"
         "-f-dev-mode"
         "-fwith-explorer"
-        # https://github.com/NixOS/nixpkgs/pull/24692#issuecomment-306509337
-        "--ghc-option=-optl-lm"
       ];
     });
     cardano-sl-static = justStaticExecutables self.cardano-sl;

diff --git a/tools/cardano-sl-tools.cabal b/tools/cardano-sl-tools.cabal
@@ -67,6 +67,8 @@ executable cardano-analyzer
   if os(linux)
     ghc-options:       -optl-fuse-ld=gold
     ld-options:        -fuse-ld=gold
+  -- ld.gold needs these explicitly
+  extra-libraries:     m
 
   default-extensions:   DeriveDataTypeable
                         DeriveGeneric
@@ -115,6 +117,8 @@ executable cardano-wallet-hs2purs
   if os(linux)
     ghc-options:       -optl-fuse-ld=gold
     ld-options:        -fuse-ld=gold
+  -- ld.gold needs these explicitly
+  extra-libraries:     m
 
   default-extensions:   DeriveDataTypeable
                         DeriveGeneric
@@ -187,6 +191,8 @@ executable cardano-dht-keygen
   if os(linux)
     ghc-options:       -optl-fuse-ld=gold
     ld-options:        -fuse-ld=gold
+  -- ld.gold needs these explicitly
+  extra-libraries:     m
 
   default-extensions:   DeriveDataTypeable
                         DeriveGeneric
@@ -245,6 +251,8 @@ executable cardano-swagger
   if os(linux)
     ghc-options:       -optl-fuse-ld=gold
     ld-options:        -fuse-ld=gold
+  -- ld.gold needs these explicitly
+  extra-libraries:     m
 
   default-extensions:   NoImplicitPrelude
                         BangPatterns
@@ -281,6 +289,8 @@ executable cardano-checks
   if os(linux)
     ghc-options:       -optl-fuse-ld=gold
     ld-options:        -fuse-ld=gold
+  -- ld.gold needs these explicitly
+  extra-libraries:     m
 
   default-extensions:  OverloadedStrings
                        BangPatterns
@@ -314,6 +324,8 @@ executable cardano-genupdate
   if os(linux)
     ghc-options:       -optl-fuse-ld=gold
     ld-options:        -fuse-ld=gold
+  -- ld.gold needs these explicitly
+  extra-libraries:     m
 
   default-extensions:  OverloadedStrings
                        NoImplicitPrelude
@@ -361,6 +373,8 @@ executable cardano-keygen
   if os(linux)
     ghc-options:       -optl-fuse-ld=gold
     ld-options:        -fuse-ld=gold
+  -- ld.gold needs these explicitly
+  extra-libraries:     m
 
   default-extensions:   DeriveDataTypeable
                         DeriveGeneric
@@ -419,6 +433,8 @@ executable cardano-launcher
   if os(linux)
     ghc-options:       -optl-fuse-ld=gold
     ld-options:        -fuse-ld=gold
+  -- ld.gold needs these explicitly
+  extra-libraries:     m
 
   default-extensions:  OverloadedStrings
                        RecordWildCards
@@ -457,6 +473,8 @@ executable cardano-addr-convert
   if os(linux)
     ghc-options:       -optl-fuse-ld=gold
     ld-options:        -fuse-ld=gold
+  -- ld.gold needs these explicitly
+  extra-libraries:     m
 
   default-extensions:   DeriveDataTypeable
                         DeriveGeneric
@@ -503,6 +521,8 @@ executable cardano-cli-docs
   if os(linux)
     ghc-options:       -optl-fuse-ld=gold
     ld-options:        -fuse-ld=gold
+  -- ld.gold needs these explicitly
+  extra-libraries:     m
 
   default-extensions:   NoImplicitPrelude
                         BangPatterns
@@ -558,6 +578,8 @@ executable cardano-block-gen
   if os(linux)
     ghc-options:       -optl-fuse-ld=gold
     ld-options:        -fuse-ld=gold
+  -- ld.gold needs these explicitly
+  extra-libraries:     m
 
   default-extensions:   RecordWildCards
                         NoImplicitPrelude