Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
jberryman
GHC
Commits
c793cc35
Commit
c793cc35
authored
Nov 29, 2012
by
ian@well-typed.com
Browse files
libffi build system tweaks
parent
3005e909
Changes
5
Hide whitespace changes
Inline
Side-by-side
compiler/ghc.mk
View file @
c793cc35
...
...
@@ -500,7 +500,10 @@ $(foreach way,$$(compiler_stage3_WAYS),\
compiler/prelude/
PrimOp_HC_OPTS
+=
-fforce-recomp
# LibFFI.hs #includes ffi.h
ifneq
"$(UseSystemLibFFI)" "YES"
compiler/stage2/build/LibFFI.hs
:
$(libffi_HEADERS)
endif
# On Windows it seems we also need to link directly to libffi
ifeq
"$(HostOS_CPP)" "mingw32"
define
windowsDynLinkToFfi
...
...
configure.ac
View file @
c793cc35
...
...
@@ -137,7 +137,7 @@ AS_IF([test "$UseSystemLibFFI" = "YES"], [
AC_CHECK_LIB(ffi, ffi_call,
[AC_CHECK_HEADERS([ffi.h], [break], [])
AC_DEFINE([HAVE_LIBFFI], [1], [Define to 1 if you have libffi.])],
[
UseSystemLibFFI="NO"
])
[
AC_MSG_ERROR([Cannot find system libffi])
])
CFLAGS="$CFLAGS2"
LDFLAGS="$LDFLAGS2"
])
...
...
ghc.mk
View file @
c793cc35
...
...
@@ -618,18 +618,12 @@ else
MAYBE_GHCI
=
driver/ghci
endif
ifeq
"$(UseSystemLibFFI)" "YES"
MAYBE_LIBFFI
=
else
MAYBE_LIBFFI
=
libffi
endif
BUILD_DIRS
+=
\
driver
\
$(MAYBE_GHCI)
\
driver/ghc
\
driver/haddock
\
$(MAYBE_LIBFFI)
\
libffi
\
includes
\
rts
...
...
libffi/ghc.mk
View file @
c793cc35
...
...
@@ -44,6 +44,7 @@ endif
ifneq
"$(BINDIST)" "YES"
$(libffi_STAMP_CONFIGURE)
:
$(TOUCH_DEP)
false
ffi
$(
call
removeFiles,
$(libffi_STAMP_STATIC_CONFIGURE)
)
$(
call
removeFiles,
$(libffi_STAMP_STATIC_BUILD)
)
$(
call
removeFiles,
$(libffi_STAMP_STATIC_INSTALL)
)
...
...
rts/ghc.mk
View file @
c793cc35
...
...
@@ -493,7 +493,10 @@ endif
$(eval
$(call
dependencies,rts,dist,1))
$(rts_dist_depfile_c_asm)
:
$(libffi_HEADERS) $(DTRACEPROBES_H)
$(rts_dist_depfile_c_asm)
:
$(DTRACEPROBES_H)
ifneq
"$(UseSystemLibFFI)" "YES"
$(rts_dist_depfile_c_asm)
:
$(libffi_HEADERS)
endif
# -----------------------------------------------------------------------------
# compile dtrace probes if dtrace is supported
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment