|
| 1 | +From 52621bc6bf24fca2b1d8c1ef3c10ddf4fb9c52bd Mon Sep 17 00:00:00 2001 |
| 2 | +From: Dima Pasechnik < [email protected]> |
| 3 | +Date: Mon, 26 May 2025 04:03:40 -0500 |
| 4 | +Subject: [PATCH] Fixing darwin headerpad issue (#5992) |
| 5 | + |
| 6 | +--- |
| 7 | + Makefile.rules | 7 ++++--- |
| 8 | + 1 file changed, 4 insertions(+), 3 deletions(-) |
| 9 | + |
| 10 | +diff --git a/Makefile.rules b/Makefile.rules |
| 11 | +index 670e7d3f57..47dffbaae6 100644 |
| 12 | +--- a/Makefile.rules |
| 13 | ++++ b/Makefile.rules |
| 14 | +@@ -431,7 +431,7 @@ build/obj/%.c.o: %.c cnf/GAP-CFLAGS cnf/GAP-CPPFLAGS $(obj_deps) |
| 15 | + ######################################################################## |
| 16 | + |
| 17 | + LINK=$(CC) |
| 18 | +- |
| 19 | ++GAP_INSTALL_EXTRAFLAGS = |
| 20 | + SHLIB_MAJOR = $(GAP_KERNEL_MAJOR_VERSION) |
| 21 | + ifneq (,$(findstring cygwin,$(host_os))) |
| 22 | + SHLIB_EXT=.dll |
| 23 | +@@ -447,7 +447,8 @@ else ifneq (,$(findstring darwin,$(host_os))) |
| 24 | + LINK_SHLIB_FLAGS += -compatibility_version $(LIBGAP_COMPAT_VER) |
| 25 | + LINK_SHLIB_FLAGS += -current_version $(LIBGAP_CURRENT_VER) |
| 26 | + LINK_SHLIB_FLAGS += -Wl,-single_module |
| 27 | +- LINK_SHLIB_FLAGS += -headerpad_max_install_names |
| 28 | ++ LINK_SHLIB_FLAGS += -Wl,-headerpad_max_install_names |
| 29 | ++ GAP_INSTALL_EXTRAFLAGS = -Wl,-headerpad_max_install_names |
| 30 | + |
| 31 | + GAP_CPPFLAGS += -DPIC |
| 32 | + GAP_CFLAGS += -fno-common |
| 33 | +@@ -519,7 +520,7 @@ build/main.c: src/main.c config.status |
| 34 | + |
| 35 | + # build rule for the gap executable used by the `install-bin` target |
| 36 | + build/gap-install: build/obj/build/main.c.o libgap$(SHLIB_EXT) cnf/GAP-LDFLAGS cnf/GAP-LIBS cnf/GAP-OBJS |
| 37 | +- $(QUIET_LINK)$(LINK) $(GAP_LDFLAGS) $< $(GAP_LIBS) -L${abs_builddir} -lgap -o $@ |
| 38 | ++ $(QUIET_LINK)$(LINK) $(GAP_LDFLAGS) $(GAP_INSTALL_EXTRAFLAGS) $< $(GAP_LIBS) -L${abs_builddir} -lgap -o $@ |
| 39 | + $(INSTALL_NAME_TOOL) -change $(LIBGAP_FULL) $(libdir)/$(LIBGAP_FULL) $@ |
| 40 | + |
| 41 | + endif |
0 commit comments