Skip to content
Snippets Groups Projects
Commit 1c071c54 authored by Ben Gamari's avatar Ben Gamari
Browse files

Revert "rts: Drop redundant flags for libffi"

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

This reverts commit 3ce18700.
parent 8a1c3ebc
No related branches found
No related tags found
No related merge requests found
...@@ -489,10 +489,15 @@ endif ...@@ -489,10 +489,15 @@ endif
endif endif
# add CFLAGS for libffi # 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: # ffi.h triggers prototype warnings, so disable them here:
rts/Interpreter_CC_OPTS += -Wno-strict-prototypes rts/Interpreter_CC_OPTS += -Wno-strict-prototypes $(LIBFFI_CFLAGS)
rts/Adjustor_CC_OPTS += -Wno-strict-prototypes rts/Adjustor_CC_OPTS += -Wno-strict-prototypes $(LIBFFI_CFLAGS)
rts/sm/Storage_CC_OPTS += -Wno-strict-prototypes rts/sm/Storage_CC_OPTS += -Wno-strict-prototypes $(LIBFFI_CFLAGS)
# ffi.h triggers undefined macro warnings on PowerPC, disable those: # ffi.h triggers undefined macro warnings on PowerPC, disable those:
# this matches substrings of powerpc64le, including "powerpc" and "powerpc64" # this matches substrings of powerpc64le, including "powerpc" and "powerpc64"
ifneq "$(findstring $(TargetArch_CPP), powerpc64le)" "" ifneq "$(findstring $(TargetArch_CPP), powerpc64le)" ""
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment