pyrox.dev
ghcjs: build hoogle docs for base libraries
+14
-8
pkgs/development/compilers/ghcjs/ghcjs.patch
+14
-8
pkgs/development/compilers/ghcjs/ghcjs.patch
···
1
1
diff --git a/src-bin/Boot.hs b/src-bin/Boot.hs
2
-
index 3c68dcf..64f3cf7 100644
2
+
index db8b12e..7b815c5 100644
3
3
--- a/src-bin/Boot.hs
4
4
+++ b/src-bin/Boot.hs
5
-
@@ -512,9 +512,7 @@ initPackageDB :: B ()
5
+
@@ -526,9 +526,7 @@ initPackageDB :: B ()
6
6
initPackageDB = do
7
7
msg info "creating package databases"
8
8
initDB "--global" <^> beLocations . blGlobalDB
···
12
12
initDB dbName db = do
13
13
rm_rf db >> mkdir_p db
14
14
ghcjs_pkg_ ["init", toTextI db] `catchAny_` return ()
15
-
@@ -538,29 +536,22 @@ installDevelopmentTree = subTop $ do
15
+
@@ -552,29 +550,22 @@ installDevelopmentTree = subTop $ do
16
16
msgD info $ "preparing development boot tree"
17
17
checkpoint' "ghcjs-boot-git" "ghcjs-boot repository already cloned and prepared" $ do
18
18
testGit "ghcjs-boot" >>= \case
···
46
46
mapM_ patchPackage =<< allPackages
47
47
preparePrimops
48
48
buildGenPrim
49
-
@@ -1085,8 +1076,11 @@ cabalInstallFlags parmakeGhcjs = do
49
+
@@ -1110,14 +1101,14 @@ cabalInstallFlags parmakeGhcjs = do
50
50
, "--avoid-reinstalls"
51
51
, "--builddir", "dist"
52
52
, "--with-compiler", ghcjs ^. pgmLocText
···
58
58
+ , "--libsubdir", "$pkgid"
59
59
, bool haddock "--enable-documentation" "--disable-documentation"
60
60
, "--haddock-html"
61
-
-- workaround for hoogle support being broken in haddock for GHC 7.10RC1
61
+
--- workaround for hoogle support being broken in haddock for GHC 7.10RC1
62
+
-#if !(__GLASGOW_HASKELL__ >= 709)
63
+
, "--haddock-hoogle"
64
+
-#endif
65
+
, "--haddock-hyperlink-source"
66
+
-- don't slow down Windows builds too much, on other platforms we get this more
67
+
-- or less for free, thanks to dynamic-too
62
68
diff --git a/src/Compiler/Info.hs b/src/Compiler/Info.hs
63
-
index 33a401f..79833c5 100644
69
+
index 33a401f..e2405a7 100644
64
70
--- a/src/Compiler/Info.hs
65
71
+++ b/src/Compiler/Info.hs
66
72
@@ -48,13 +48,7 @@ compilerInfo nativeToo dflags = do
67
-
73
+
68
74
-- | the directory to use if started without -B flag
69
75
getDefaultTopDir :: IO FilePath
70
76
-getDefaultTopDir = do
···
75
81
- targetOS = os
76
82
- subdir = targetARCH ++ '-':targetOS ++ '-':getFullCompilerVersion
77
83
+getDefaultTopDir = return "@PREFIX@/lib/ghcjs-@VERSION@"
78
-
84
+
79
85
getDefaultLibDir :: IO FilePath
80
86
getDefaultLibDir = getDefaultTopDir