Skip to content
This repository has been archived by the owner on Aug 2, 2020. It is now read-only.

Fix warnings #547

Merged
merged 2 commits into from
Apr 3, 2018
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Link to GitHub issues
  • Loading branch information
snowleopard committed Apr 3, 2018
commit e504410dbe0d0e2a396777762477a85301708fa3
13 changes: 0 additions & 13 deletions src/GHC.hs
Original file line number Diff line number Diff line change
Expand Up @@ -156,19 +156,6 @@ autogenPath context@Context {..}
where
autogen dir = contextPath context <&> (-/- dir -/- "autogen")

-- ref: mk/config.mk
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See #549.

-- | Command line tool for stripping.
-- stripCmdPath :: Action FilePath
-- stripCmdPath = do
-- targetPlatform <- setting TargetPlatform
-- top <- topDirectory
-- case targetPlatform of
-- "x86_64-unknown-mingw32" ->
-- return (top -/- "inplace/mingw/bin/strip.exe")
-- "arm-unknown-linux" ->
-- return ":" -- HACK: from the make-based system, see the ref above
-- _ -> return "strip"

buildDll0 :: Context -> Action Bool
buildDll0 Context {..} = do
windows <- windowsHost
Expand Down
1 change: 1 addition & 0 deletions src/Hadrian/Haskell/Cabal/Parse.hs
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,7 @@ parsePackageData context@Context {..} = do
liftIO $ C.initialBuildSteps cPath pd' lbi' C.silent

-- TODO: Get rid of deprecated 'externalPackageDeps' and drop -Wno-deprecations
-- See: https://github.com/snowleopard/hadrian/issues/548
let extDeps = C.externalPackageDeps lbi'
deps = map (C.display . snd) extDeps
dep_direct = map (fromMaybe (error "dep_keys failed")
Expand Down
2 changes: 1 addition & 1 deletion src/Settings/Builders/GhcCabal.hs
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ ghcCabalBuilderArgs = mconcat
-- XXX we need to set --with-strip= (stripCmdPath :: Action FilePath), and if it's ':' disable
-- stripping as well. As it is now, I believe we might have issues with stripping on
-- windows, as I can't see a consumer of `stripCmdPath`.
-- TODO: See https://github.com/snowleopard/hadrian/issues/549.
, crossCompiling ? pure [ "--disable-executable-stripping", "--disable-library-stripping" ]
, arg "--cabal-file"
, arg =<< fromJust . pkgCabalFile <$> getPackage
Expand Down Expand Up @@ -52,7 +53,6 @@ ghcCabalBuilderArgs = mconcat
]
]


-- TODO: Isn't vanilla always built? If yes, some conditions are redundant.
-- TODO: Need compiler_stage1_CONFIGURE_OPTS += --disable-library-for-ghci?
-- TODO: should `elem` be `wayUnit`?
Expand Down