Fix Lasca compilation on Ubuntu. Link lascartStatic after an object f…

…ile.
nau · Oct 7, 2018 · ebb9b0b · ebb9b0b
1 parent 663810c
commit ebb9b0b
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/src/lib/Lasca/Compiler.hs b/src/lib/Lasca/Compiler.hs
@@ -142,9 +142,7 @@ compileExecutable opts fname mod = do
     let lascaPath = fromMaybe "." lascaPathEnv
     absLascaPathEnv <- mapM canonicalizePath (splitSearchPath lascaPath)
     let cc = fromMaybe (error "Did find C compiler. Install Clang or GCC, or define CC environment variable") result
-        lascartStaticLink = if os == "darwin"
-            then ["-llascartStatic"]
-            else ["-Wl,--whole-archive", "-llascartStatic" , "-Wl,--no-whole-archive"]
+        lascartStaticLink  = ["-llascartStatic"]
         lascartDynamicLink = ["-llascart"]
         libLascaLink = ["-rdynamic"]
             -- passes --export-dynamic to the linker.
@@ -153,7 +151,8 @@ compileExecutable opts fname mod = do
             -- ++ lascartDynamicLink
         libDirs = fmap (\p -> "-L" ++ p) absLascaPathEnv
         links = ["-lgc", "-lffi", "-lm", "-lpcre2-8"]
-    let args = optimizationOpts ++ libDirs ++ ["-fPIC", "-g"] ++ libLascaLink ++ links ++ [ "-o", outputPath, fname ++ ".o"]
+    -- object files must be specified before libraries for successful static linking
+    let args = optimizationOpts ++ [ "-o", outputPath, fname ++ ".o"] ++ libDirs ++ ["-fPIC", "-g"] ++ libLascaLink ++ links
     let command = unwords $ cc : args
     when (verboseMode opts) $ putStrLn command
     (output, errCode) <- getProcessOutput command