From 1c071c54c712659f76f47eaddc1dd390822752bd Mon Sep 17 00:00:00 2001
From: Ben Gamari <ben@smart-cactus.org>
Date: Tue, 10 Dec 2019 16:07:37 -0500
Subject: [PATCH] Revert "rts: Drop redundant flags for libffi"

This seems to have regressed builds using `--with-system-libffi`
(#17520).

This reverts commit 3ce18700f80a12c48a029b49c6201ad2410071bb.
---
 rts/ghc.mk | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/rts/ghc.mk b/rts/ghc.mk
index dfff8df796b7..451b1912cbc8 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)" ""
-- 
GitLab