Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Glasgow Haskell Compiler
Packages
Cabal
Commits
03972c48
Commit
03972c48
authored
May 03, 2006
by
Ross Paterson
Browse files
pass correct -P flag to ffihugs
The -P flag wasn't superfluous, but it was wrong for executables.
parent
f9855b04
Changes
1
Hide whitespace changes
Inline
Side-by-side
Distribution/Simple/Hugs.hs
View file @
03972c48
...
...
@@ -109,7 +109,7 @@ build pkg_descr lbi verbose = do
copyFile
(
autogenModulesDir
lbi
`
joinFileName
`
paths_modulename
)
destPathsFile
compileBuildInfo
exeDir
(
maybe
[]
(
hsSourceDirs
.
libBuildInfo
)
(
library
pkg_descr
))
exeMods
bi
compileFiles
bi
[
destMainFile
,
destPathsFile
]
compileFiles
bi
exeDir
[
destMainFile
,
destPathsFile
]
compileBuildInfo
::
FilePath
->
[
FilePath
]
-- ^library source dirs, if building exes
...
...
@@ -132,7 +132,7 @@ build pkg_descr lbi verbose = do
-- Pass 2: compile foreign stubs in build directory
stubsFileLists
<-
sequence
[
moduleToFilePath
[
destDir
]
modu
suffixes
|
modu
<-
mods
]
compileFiles
bi
(
concat
stubsFileLists
)
compileFiles
bi
destDir
(
concat
stubsFileLists
)
suffixes
=
[
"hs"
,
"lhs"
]
...
...
@@ -148,12 +148,12 @@ build pkg_descr lbi verbose = do
else
copyFile
srcFile
destFile
compileFiles
::
BuildInfo
->
[
FilePath
]
->
IO
()
compileFiles
bi
fileList
=
do
compileFiles
::
BuildInfo
->
FilePath
->
[
FilePath
]
->
IO
()
compileFiles
bi
modDir
fileList
=
do
ffiFileList
<-
filterM
testFFI
fileList
unless
(
null
ffiFileList
)
$
do
when
(
verbose
>
2
)
(
putStrLn
"Compiling FFI stubs"
)
mapM_
(
compileFFI
bi
)
ffiFileList
mapM_
(
compileFFI
bi
modDir
)
ffiFileList
-- Only compile FFI stubs for a file if it contains some FFI stuff
testFFI
::
FilePath
->
IO
Bool
...
...
@@ -161,14 +161,15 @@ build pkg_descr lbi verbose = do
inp
<-
readHaskellFile
file
return
(
"foreign"
`
elem
`
symbols
(
stripComments
False
inp
))
compileFFI
::
BuildInfo
->
FilePath
->
IO
()
compileFFI
bi
file
=
do
compileFFI
::
BuildInfo
->
FilePath
->
FilePath
->
IO
()
compileFFI
bi
modDir
file
=
do
(
_
,
opts
,
file_incs
)
<-
getOptionsFromSource
file
let
ghcOpts
=
hcOptions
GHC
opts
let
pkg_incs
=
[
"
\"
"
++
inc
++
"
\"
"
|
inc
<-
includes
bi
++
installIncludes
bi
]
let
incs
=
nub
(
sort
(
file_incs
++
includeOpts
ghcOpts
++
pkg_incs
))
let
hugsArgs
=
"-98"
:
map
(
"-i"
++
)
incs
let
pathFlag
=
"-P"
++
modDir
++
[
searchPathSeparator
]
let
hugsArgs
=
"-98"
:
pathFlag
:
map
(
"-i"
++
)
incs
cfiles
<-
getCFiles
file
let
cArgs
=
[
"-I"
++
dir
|
dir
<-
includeDirs
bi
]
++
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment