suzanne.soy/tock-mirror
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Moved the extra parameters in the compiler commands so that the source file is always the last parameter

Browse Source
This commit is contained in:
Neil Brown 2009-05-22 17:13:10 +00:00
parent ed63476ad7
commit 014f83d65d
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
config/CompilerCommands.hs.in
View File

@ -9,20 +9,17 @@ tockIncludeFlags :: String
tockIncludeFlags = "-I. -I" ++ pkgIncludeDir tockIncludeFlags = "-I. -I" ++ pkgIncludeDir
cCommand :: String -> String -> String -> String cCommand :: String -> String -> String -> String
cCommand inp out extra = "@CC@ @TOCK_CFLAGS@ " ++ tockIncludeFlags ++ " -c -o " ++ out ++ " " ++ inp cCommand inp out extra = "@CC@ @TOCK_CFLAGS@ " ++ tockIncludeFlags ++ " -c -o " ++ out ++ " " ++ extra ++ " " ++ inp
++ " " ++ extra
cAsmCommand :: String -> String -> String -> String cAsmCommand :: String -> String -> String -> String
cAsmCommand inp out extra = "@CC@ @TOCK_CFLAGS@ -S " ++ tockIncludeFlags ++ " -o " ++ out ++ " " ++ inp ++ cAsmCommand inp out extra = "@CC@ @TOCK_CFLAGS@ -S " ++ tockIncludeFlags ++ " -o " ++ out ++ " " ++ extra ++ " " ++ inp
" " ++ extra
cLinkCommand :: [String] -> String -> String -> String cLinkCommand :: [String] -> String -> String -> String
cLinkCommand files out extra = "@CC@ @TOCK_CFLAGS@ -o " ++ out ++ " " ++ (concat (intersperse " " files)) ++ " @TOCK_CLDFLAGS@" cLinkCommand files out extra = "@CC@ @TOCK_CFLAGS@ -o " ++ out ++ " " ++ (concat (intersperse " " files)) ++ " @TOCK_CLDFLAGS@"
++ " " ++ extra ++ " " ++ extra
cxxCommand :: String -> String -> String -> String cxxCommand :: String -> String -> String -> String
cxxCommand inp out extra = "@CXX@ @TOCK_CXXFLAGS@ " ++ tockIncludeFlags ++ " -o " ++ out ++ " " ++ inp ++ " @TOCK_CXXLDFLAGS@" cxxCommand inp out extra = "@CXX@ @TOCK_CXXFLAGS@ " ++ tockIncludeFlags ++ " -o " ++ out ++ " @TOCK_CXXLDFLAGS@ " ++ extra ++ " " ++ inp
++ " " ++ extra
hCommand :: String -> String -> String hCommand :: String -> String -> String
hCommand inp out = "@GHC@ --make " ++ inp ++ " -o " ++ out hCommand inp out = "@GHC@ --make " ++ inp ++ " -o " ++ out