projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Template Haskell: improve lifting for strings
[ghc-hetmet.git]
/
libffi
/
ghc.mk
diff --git
a/libffi/ghc.mk
b/libffi/ghc.mk
index
fde3a9c
..
0394d1d
100644
(file)
--- a/
libffi/ghc.mk
+++ b/
libffi/ghc.mk
@@
-119,10
+119,13
@@
$(libffi_STAMP_CONFIGURE):
PATH=`pwd`:$$PATH; \
export PATH; \
cd build && \
PATH=`pwd`:$$PATH; \
export PATH; \
cd build && \
- CC=$(WhatGccIsCalled) $(SHELL) configure \
- --enable-static=yes \
+ CC=$(WhatGccIsCalled) \
+ CFLAGS="$(SRC_CC_OPTS)" \
+ LDFLAGS="$(SRC_LD_OPTS)" \
+ $(SHELL) configure \
+ --enable-static=yes \
--enable-shared=$(libffi_EnableShared) \
--enable-shared=$(libffi_EnableShared) \
- --host=$(PLATFORM) --build=$(PLATFORM)
+ --host=$(PLATFORM) --build=$(PLATFORM)
# libffi.so needs to be built with the correct soname.
# NOTE: this builds libffi_convience.so with the incorrect
# libffi.so needs to be built with the correct soname.
# NOTE: this builds libffi_convience.so with the incorrect
@@
-163,7
+166,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) -c empty.c -o HSffi.o
+ $(CC) $(SRC_CC_OPTS) -c empty.c -o HSffi.o
$(eval $(call all-target,libffi,libffi/HSffi.o))
$(eval $(call all-target,libffi,libffi/HSffi.o))