Skip to content

Commit

Permalink
proton: don't use --enable-pax_emutramp for libffi (arch does this, f…
Browse files Browse the repository at this point in the history
…edora does not
  • Loading branch information
GloriousEggroll committed May 10, 2020
1 parent c755d3c commit befbdfc
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions build/makefile_base.mak
Original file line number Diff line number Diff line change
Expand Up @@ -1879,13 +1879,13 @@ LIBFFI_CONFIGURE_FILES64 := $(LIBFFI_OBJ64)/Makefile
$(LIBFFI_CONFIGURE_FILES64): SHELL = $(CONTAINER_SHELL64)
$(LIBFFI_CONFIGURE_FILES64): $(MAKEFILE_DEP) $(LIBFFI) | $(LIBFFI_OBJ64)
cd "$(LIBFFI_OBJ64)" && \
../$(LIBFFI)/configure --prefix=$(abspath $(TOOLS_DIR64)) --disable-static --enable-pax_emutramp
../$(LIBFFI)/configure --prefix=$(abspath $(TOOLS_DIR64)) --disable-static

# 32-bit configure
$(LIBFFI_CONFIGURE_FILES32): SHELL = $(CONTAINER_SHELL32)
$(LIBFFI_CONFIGURE_FILES32): $(MAKEFILE_DEP) $(LIBFFI) | $(LIBFFI_OBJ32)
cd "$(LIBFFI_OBJ32)" && \
../$(LIBFFI)/configure --prefix=$(abspath $(TOOLS_DIR32)) --disable-static --enable-pax_emutramp
../$(LIBFFI)/configure --prefix=$(abspath $(TOOLS_DIR32)) --disable-static

## libffi goals
LIBFFI_TARGETS = libffi libffi_configure libffi32 libffi64 libffi_configure32 libffi_configure64
Expand Down

0 comments on commit befbdfc

Please sign in to comment.