Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
GHC
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
haskell-wasm
GHC
Commits
4499b294
Unverified
Commit
4499b294
authored
7 years ago
by
Andrey Mokhov
Committed by
GitHub
7 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Follow GHC changes (#479)
parent
8fd68186
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/Rules/Program.hs
+0
-3
0 additions, 3 deletions
src/Rules/Program.hs
src/Settings/Warnings.hs
+0
-2
0 additions, 2 deletions
src/Settings/Warnings.hs
with
0 additions
and
5 deletions
src/Rules/Program.hs
+
0
−
3
View file @
4499b294
...
@@ -92,7 +92,6 @@ buildWrapper context@Context {..} wrapper wrapperPath wrapped = do
...
@@ -92,7 +92,6 @@ buildWrapper context@Context {..} wrapper wrapperPath wrapped = do
putSuccess
$
"| Successfully created wrapper for "
++
putSuccess
$
"| Successfully created wrapper for "
++
quote
(
pkgName
package
)
++
" ("
++
show
stage
++
")."
quote
(
pkgName
package
)
++
" ("
++
show
stage
++
")."
-- TODO: Get rid of the Paths_hsc2hs.o hack.
buildBinary
::
[(
Resource
,
Int
)]
->
FilePath
->
Context
->
Action
()
buildBinary
::
[(
Resource
,
Int
)]
->
FilePath
->
Context
->
Action
()
buildBinary
rs
bin
context
@
Context
{
..
}
=
do
buildBinary
rs
bin
context
@
Context
{
..
}
=
do
binDeps
<-
if
stage
==
Stage0
&&
package
==
ghcCabal
binDeps
<-
if
stage
==
Stage0
&&
package
==
ghcCabal
...
@@ -107,8 +106,6 @@ buildBinary rs bin context@Context {..} = do
...
@@ -107,8 +106,6 @@ buildBinary rs bin context@Context {..} = do
cObjs
<-
mapM
(
objectPath
context
)
cSrcs
cObjs
<-
mapM
(
objectPath
context
)
cSrcs
hsObjs
<-
hsObjects
context
hsObjs
<-
hsObjects
context
return
$
cObjs
++
hsObjs
return
$
cObjs
++
hsObjs
++
[
path
-/-
"Paths_hsc2hs.o"
|
package
==
hsc2hs
]
++
[
path
-/-
"Paths_haddock.o"
|
package
==
haddock
]
need
binDeps
need
binDeps
buildWithResources
rs
$
target
context
(
Ghc
LinkHs
stage
)
binDeps
[
bin
]
buildWithResources
rs
$
target
context
(
Ghc
LinkHs
stage
)
binDeps
[
bin
]
synopsis
<-
traverse
pkgSynopsis
(
pkgCabalFile
package
)
synopsis
<-
traverse
pkgSynopsis
(
pkgCabalFile
package
)
...
...
This diff is collapsed.
Click to expand it.
src/Settings/Warnings.hs
+
0
−
2
View file @
4499b294
...
@@ -32,8 +32,6 @@ warningArgs = builder Ghc ? do
...
@@ -32,8 +32,6 @@ warningArgs = builder Ghc ? do
,
package
binary
?
pure
[
"-Wno-deprecations"
]
,
package
binary
?
pure
[
"-Wno-deprecations"
]
,
package
bytestring
?
pure
[
"-Wno-inline-rule-shadowing"
]
,
package
bytestring
?
pure
[
"-Wno-inline-rule-shadowing"
]
,
package
compiler
?
pure
[
"-Wcpp-undef"
]
,
package
compiler
?
pure
[
"-Wcpp-undef"
]
-- FIXME: See https://phabricator.haskell.org/D4121#117481.
,
input
"//SysTools.hs"
?
pure
[
"-Wno-unused-imports"
]
,
package
directory
?
pure
[
"-Wno-unused-imports"
]
,
package
directory
?
pure
[
"-Wno-unused-imports"
]
,
package
ghc
?
pure
[
"-Wcpp-undef"
]
,
package
ghc
?
pure
[
"-Wcpp-undef"
]
,
package
ghcPrim
?
pure
[
"-Wno-trustworthy-safe"
]
,
package
ghcPrim
?
pure
[
"-Wno-trustworthy-safe"
]
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment