From 539728ac04ed6e44cca4badb3deee8626f795055 Mon Sep 17 00:00:00 2001 From: David Cock Date: Mon, 24 Aug 2015 10:46:44 +0200 Subject: [PATCH] Cleanup Signed-off-by: David Cock --- hake/Main.hs | 6 ++---- hake/X86_32.hs | 4 ++-- hake/X86_64.hs | 3 +-- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/hake/Main.hs b/hake/Main.hs index 840a421..d86cf13 100644 --- a/hake/Main.hs +++ b/hake/Main.hs @@ -369,8 +369,8 @@ makefilePreamble h opts args = "# Hake was invoked with the following command line args:" ] ++ [ "# " ++ a | a <- args ] ++ [ "# ", - "SRCDIR=" ++ (opt_sourcedir opts), - "HAKE_ARCHS=" ++ (concat $ intersperse " " Config.architectures), + "SRCDIR=" ++ opt_sourcedir opts, + "HAKE_ARCHS=" ++ intercalate " " Config.architectures, "include ./symbolic_targets.mk" ]) -- There a several valid top-level build directores, apart from the @@ -435,9 +435,7 @@ makefileRuleInner h tokens double_colon = do printTokens h $ ruleOutputs compiledRule if double_colon then hPutStr h ":: " else hPutStr h ": " printTokens h $ ruleDepends compiledRule - -- printDirs h $ ruleDirs compiledRule hPutStr h " | directories " - --when (not (S.null (rulePreDepends compiledRule))) $ do printTokens h $ rulePreDepends compiledRule hPutStrLn h "" doBody diff --git a/hake/X86_32.hs b/hake/X86_32.hs index 914d1f7..77ef6c1 100644 --- a/hake/X86_32.hs +++ b/hake/X86_32.hs @@ -32,7 +32,7 @@ ourCommonFlags = [ Str "-m32", Str "-mno-red-zone", Str "-fPIE", Str "-fno-stack-protector", - Str "-Wno-unused-but-set-variable", + Str "-Wno-unused-but-set-variable", Str "-Wno-packed-bitfield-compat", Str "-D__x86__" ] @@ -87,7 +87,7 @@ kernelCFlags = [ Str s | s <- [ "-fno-builtin", "-Wmissing-field-initializers", "-Wredundant-decls", "-Wno-packed-bitfield-compat", - "-Wno-unused-but-set-variable", + "-Wno-unused-but-set-variable", "-Werror", "-imacros deputy/nodeputy.h", "-mno-mmx", diff --git a/hake/X86_64.hs b/hake/X86_64.hs index 4a037d7..28a8dc9 100644 --- a/hake/X86_64.hs +++ b/hake/X86_64.hs @@ -85,7 +85,7 @@ kernelCFlags = [ Str s | s <- [ "-fno-builtin", "-Wmissing-field-initializers", "-Wredundant-decls", "-Wno-packed-bitfield-compat", - "-Wno-unused-but-set-variable", + "-Wno-unused-but-set-variable", "-Werror", "-imacros deputy/nodeputy.h", "-mno-mmx", @@ -94,7 +94,6 @@ kernelCFlags = [ Str s | s <- [ "-fno-builtin", "-mno-sse3", "-mno-sse4.1", "-mno-sse4.2", --- "-Wno-unused-but-set-variable", "-mno-sse4", "-mno-sse4a", "-mno-3dnow" ]] -- 1.7.2.5