From 3ce18700f80a12c48a029b49c6201ad2410071bb Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Fri, 4 Oct 2019 13:45:53 -0400 Subject: rts: Drop redundant flags for libffi These are now handled in the cabal file's include-dirs field. --- rts/ghc.mk | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/rts/ghc.mk b/rts/ghc.mk index 25a1561814..5bd830da6f 100644 --- a/rts/ghc.mk +++ b/rts/ghc.mk @@ -489,15 +489,10 @@ 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 $(LIBFFI_CFLAGS) -rts/Adjustor_CC_OPTS += -Wno-strict-prototypes $(LIBFFI_CFLAGS) -rts/sm/Storage_CC_OPTS += -Wno-strict-prototypes $(LIBFFI_CFLAGS) +rts/Interpreter_CC_OPTS += -Wno-strict-prototypes +rts/Adjustor_CC_OPTS += -Wno-strict-prototypes +rts/sm/Storage_CC_OPTS += -Wno-strict-prototypes # ffi.h triggers undefined macro warnings on PowerPC, disable those: # this matches substrings of powerpc64le, including "powerpc" and "powerpc64" ifneq "$(findstring $(TargetArch_CPP), powerpc64le)" "" -- cgit v1.2.1