Fix mostly-static test on windows

Author: hasufell

compiler/GHC/Driver/Session.hs

@@ -1113,7 +1113,7 @@ dynamic_flags_deps = [
       (NoArg (setGeneralFlag Opt_SingleLibFolder))
   , make_ord_flag defGhcFlag "pie"            (NoArg (setGeneralFlag Opt_PICExecutable))
   , make_ord_flag defGhcFlag "no-pie"         (NoArg (unSetGeneralFlag Opt_PICExecutable))
-  , make_ord_flag defGhcFlag "static-external" (noArg (\d -> d { ghcLink=LinkExecutable (MostlyStatic ["c", "m", "rt", "dl", "pthread", "stdc++", "c++", "c++abi", "atomic"]) }))
+  , make_ord_flag defGhcFlag "static-external" (noArg (\d -> d { ghcLink=LinkExecutable (MostlyStatic ["c", "m", "rt", "dl", "pthread", "stdc++", "c++", "c++abi", "atomic", "wsock32", "gdi32", "winmm", "dbghelp", "psapi", "user32", "shell32", "mingw32", "kernel32", "advapi32", "mingwex", "ws2_32", "shlwapi", "ole32", "rpcrt4", "ntdll", "ucrt"]) }))
   , make_ord_flag defGhcFlag "exclude-static-external"
       (OptPrefix (\str -> upd $ \d -> case ghcLink d of
                                         LinkExecutable (MostlyStatic _) ->

libraries/ghc-internal/ghc-internal.cabal.in

@@ -493,6 +493,9 @@ Library
         extra-libraries:
             wsock32, user32, shell32, mingw32, kernel32, advapi32,
             mingwex, ws2_32, shlwapi, ole32, rpcrt4, ntdll, ucrt
+        extra-libraries-static:
+            wsock32, user32, shell32, mingw32, kernel32, advapi32,
+            mingwex, ws2_32, shlwapi, ole32, rpcrt4, ntdll, ucrt
         -- Minimum supported Windows version.
         -- These numbers can be found at:
         --  https://msdn.microsoft.com/en-us/library/windows/desktop/aa383745(v=vs.85).aspx

testsuite/ghc-config/ghc-config.hs

@@ -50,6 +50,7 @@ main = do
   getGhcFieldOrDefault fields "GhcLeadingUnderscore" "Leading underscore" "NO"
   getGhcFieldOrDefault fields "GhcTablesNextToCode" "Tables next to code" "NO"
   getGhcFieldProgWithDefault fields "AR" "ar command" "ar"
+  getGhcFieldProgWithDefault fields "RANLIB" "ranlib command" "ranlib"
   getGhcFieldProgWithDefault fields "LLC" "LLVM llc command" "llc"
   getGhcFieldProgWithDefault fields "TEST_CC" "C compiler command" "gcc"
   getGhcFieldProgWithDefault fields "TEST_CC_OPTS" "C compiler flags" ""

testsuite/tests/driver/mostly-static/Hello.hs

@@ -1,3 +1,5 @@
-import Test
+foreign import ccall "my_func" c_my_func :: IO Int
 
-main = print test
+main = do
+    x <- c_my_func
+    print x

testsuite/tests/driver/mostly-static/Makefile

@@ -19,9 +19,11 @@ clean:
 .PHONY: mostly-static
 mostly-static:
 	@rm -rf $(LOCAL_PKGCONF)
-	"$(TEST_HC)" $(TEST_HC_OPTS) -this-unit-id test-1.0 -c test/Test.hs -staticlib -o test/libtest-1.0.a
+	"$(TEST_CC)" -c "test/test.c" -o "test/test.o"
+	"$(AR)" qc "test/libtest-1.0.a" "test/test.o"
+	"$(RANLIB)" "test/libtest-1.0.a"
 	"$(GHC_PKG)" init $(LOCAL_PKGCONF)
 	"$(GHC_PKG)" --no-user-package-db -f $(LOCAL_PKGCONF) register test/test.pkg -v0
-	"$(TEST_HC)" $(TEST_HC_OPTS) --make -static-external -exclude-static-external=c,m,rt,dl,pthread,stdc++,atomic,gmp,ffi,iconv -hide-all-packages -package-db $(LOCAL_PKGCONF)/ -package base -package-id test-1.0 Hello.hs
+	"$(TEST_HC)" $(TEST_HC_OPTS) --make -static-external -exclude-static-external=c,m,rt,dl,pthread,stdc++,atomic,gmp,ffi,iconv,wsock32,gdi32,winmm,dbghelp,psapi,user32,shell32,mingw32,kernel32,advapi32,mingwex,ws2_32,shlwapi,ole32,rpcrt4,ntdll,ucrt -hide-all-packages -package-db $(LOCAL_PKGCONF)/ -package base -package-id test-1.0 Hello.hs
 	./Hello
 	$(LDD) Hello | grep libtest || true

testsuite/tests/driver/mostly-static/test/Test.hs

@@ -0,0 +1,3 @@
+int my_func(void) {
+  return 42;
+}

testsuite/tests/driver/mostly-static/test/test.c

@@ -0,0 +1 @@
+int my_func(void);

testsuite/tests/driver/mostly-static/test/test.h

@@ -2,8 +2,9 @@ name: test
 version: 1.0
 id: test-1.0
 key: test-1.0
-exposed-modules: Test
 import-dirs: ${pkgroot}/test
+include-dirs: ${pkgroot}/test
+includes: test.h
 library-dirs-static: ${pkgroot}/test
 extra-libraries-static: test-1.0
 exposed: True