projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make tyConSingleDataCon_maybe more forgiving
[ghc-hetmet.git]
/
libffi
/
ghc.mk
diff --git
a/libffi/ghc.mk
b/libffi/ghc.mk
index
d7474c9
..
d3e57be
100644
(file)
--- a/
libffi/ghc.mk
+++ b/
libffi/ghc.mk
@@
-82,7
+82,7
@@
libffi_DYNAMIC_PROG = $(libffi_HS_DYN_LIB).a
libffi_DYNAMIC_LIBS = $(libffi_HS_DYN_LIB)
else
libffi_DYNAMIC_PROG =
libffi_DYNAMIC_LIBS = $(libffi_HS_DYN_LIB)
else
libffi_DYNAMIC_PROG =
-libffi_DYNAMIC_LIBS = libffi/libffi.so libffi/libffi.so.5 libffi/libffi.so.5.0.7
+libffi_DYNAMIC_LIBS = libffi/libffi.so libffi/libffi.so.5 libffi/libffi.so.5.0.9
endif
ifeq "$(BuildSharedLibs)" "YES"
endif
ifeq "$(BuildSharedLibs)" "YES"
@@
-122,8
+122,8
@@
$(libffi_STAMP_CONFIGURE):
export PATH; \
cd build && \
CC=$(WhatGccIsCalled) \
export PATH; \
cd build && \
CC=$(WhatGccIsCalled) \
- CFLAGS="$(SRC_CC_OPTS) -w" \
- LDFLAGS="$(SRC_LD_OPTS) -w" \
+ CFLAGS="$(SRC_CC_OPTS) $(CONF_CC_OPTS) -w" \
+ LDFLAGS="$(SRC_LD_OPTS) $(CONF_LD_OPTS) -w" \
"$(SHELL)" configure \
--enable-static=yes \
--enable-shared=$(libffi_EnableShared) \
"$(SHELL)" configure \
--enable-static=yes \
--enable-shared=$(libffi_EnableShared) \
@@
-168,7
+168,7
@@
$(eval $(call all-target,libffi,libffi/libHSffi.a libffi/libHSffi_p.a))
libffi/HSffi.o: libffi/libHSffi.a
cd libffi && \
touch empty.c; \
libffi/HSffi.o: libffi/libHSffi.a
cd libffi && \
touch empty.c; \
- "$(CC)" $(SRC_CC_OPTS) -c empty.c -o HSffi.o
+ "$(CC)" $(SRC_CC_OPTS) $(CONF_CC_OPTS) -c empty.c -o HSffi.o
$(eval $(call all-target,libffi,libffi/HSffi.o))
$(eval $(call all-target,libffi,libffi/HSffi.o))