diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2019-12-10 16:07:37 -0500 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2019-12-12 02:27:34 -0500 |
| commit | 7179b968c709eb0f5413c8e3847a8a593c596185 (patch) | |
| tree | 02f9bfde556faae07ec9ac53e4e8e7fbf3e5174d | |
| parent | 9f0ee2534fcfd95b0870d09718ac3c31704f5753 (diff) | |
| download | haskell-7179b968c709eb0f5413c8e3847a8a593c596185.tar.gz | |
Revert "rts: Drop redundant flags for libffi"
This seems to have regressed builds using `--with-system-libffi`
(#17520).
This reverts commit 3ce18700f80a12c48a029b49c6201ad2410071bb.
| -rw-r--r-- | rts/ghc.mk | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/rts/ghc.mk b/rts/ghc.mk index dfff8df796..451b1912cb 100644 --- a/rts/ghc.mk +++ b/rts/ghc.mk @@ -489,10 +489,15 @@ endif endif # add CFLAGS for libffi +ifeq "$(UseSystemLibFFI)" "YES" +LIBFFI_CFLAGS = $(addprefix -I,$(FFIIncludeDir)) +else +LIBFFI_CFLAGS = +endif # ffi.h triggers prototype warnings, so disable them here: -rts/Interpreter_CC_OPTS += -Wno-strict-prototypes -rts/Adjustor_CC_OPTS += -Wno-strict-prototypes -rts/sm/Storage_CC_OPTS += -Wno-strict-prototypes +rts/Interpreter_CC_OPTS += -Wno-strict-prototypes $(LIBFFI_CFLAGS) +rts/Adjustor_CC_OPTS += -Wno-strict-prototypes $(LIBFFI_CFLAGS) +rts/sm/Storage_CC_OPTS += -Wno-strict-prototypes $(LIBFFI_CFLAGS) # ffi.h triggers undefined macro warnings on PowerPC, disable those: # this matches substrings of powerpc64le, including "powerpc" and "powerpc64" ifneq "$(findstring $(TargetArch_CPP), powerpc64le)" "" |