Skip to content

Commit 3d63aa4

Browse files
committed
Install mimalloc header only when enabled
1 parent deef17c commit 3d63aa4

File tree

3 files changed

+18
-11
lines changed

3 files changed

+18
-11
lines changed

Makefile.pre.in

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -227,6 +227,8 @@ LIBHACL_SHA2_A= Modules/_hacl/libHacl_Hash_SHA2.a
227227
# Default zoneinfo.TZPATH. Added here to expose it in sysconfig.get_config_var
228228
TZPATH=@TZPATH@
229229

230+
WITH_MIMALLOC=@WITH_MIMALLOC@
231+
230232
# Modes for directories, executables and data files created by the
231233
# install process. Default to user-only-writable for all file types.
232234
DIRMODE= 755
@@ -2581,10 +2583,11 @@ inclinstall:
25812583
$(INSTALL) -d -m $(DIRMODE) $(DESTDIR)$(INCLUDEPY)/internal; \
25822584
else true; \
25832585
fi
2584-
@if test ! -d $(DESTDIR)$(INCLUDEPY)/internal/mimalloc/mimalloc; then \
2585-
echo "Creating directory $(DESTDIR)$(INCLUDEPY)/internal/mimalloc/mimalloc"; \
2586-
$(INSTALL) -d -m $(DIRMODE) $(DESTDIR)$(INCLUDEPY)/internal/mimalloc/mimalloc; \
2587-
else true; \
2586+
@if test "$(WITH_MIMALLOC)" == "yes"; then \
2587+
if test ! -d $(DESTDIR)$(INCLUDEPY)/internal/mimalloc/mimalloc; then \
2588+
echo "Creating directory $(DESTDIR)$(INCLUDEPY)/internal/mimalloc/mimalloc"; \
2589+
$(INSTALL) -d -m $(DIRMODE) $(DESTDIR)$(INCLUDEPY)/internal/mimalloc/mimalloc; \
2590+
fi; \
25882591
fi
25892592
@for i in $(srcdir)/Include/*.h; \
25902593
do \
@@ -2601,13 +2604,15 @@ inclinstall:
26012604
echo $(INSTALL_DATA) $$i $(INCLUDEPY)/internal; \
26022605
$(INSTALL_DATA) $$i $(DESTDIR)$(INCLUDEPY)/internal; \
26032606
done
2604-
echo $(INSTALL_DATA) $(srcdir)/Include/internal/mimalloc/mimalloc.h $(DESTDIR)$(INCLUDEPY)/internal/mimalloc/mimalloc.h
2605-
$(INSTALL_DATA) $(srcdir)/Include/internal/mimalloc/mimalloc.h $(DESTDIR)$(INCLUDEPY)/internal/mimalloc/mimalloc.h
2606-
@for i in $(srcdir)/Include/internal/mimalloc/mimalloc/*.h; \
2607-
do \
2608-
echo $(INSTALL_DATA) $$i $(INCLUDEPY)/internal/mimalloc/mimalloc; \
2609-
$(INSTALL_DATA) $$i $(DESTDIR)$(INCLUDEPY)/internal/mimalloc/mimalloc; \
2610-
done
2607+
@if test "$(WITH_MIMALLOC)" == "yes"; then \
2608+
echo $(INSTALL_DATA) $(srcdir)/Include/internal/mimalloc/mimalloc.h $(DESTDIR)$(INCLUDEPY)/internal/mimalloc/mimalloc.h; \
2609+
$(INSTALL_DATA) $(srcdir)/Include/internal/mimalloc/mimalloc.h $(DESTDIR)$(INCLUDEPY)/internal/mimalloc/mimalloc.h; \
2610+
for i in $(srcdir)/Include/internal/mimalloc/mimalloc/*.h; \
2611+
do \
2612+
echo $(INSTALL_DATA) $$i $(INCLUDEPY)/internal/mimalloc/mimalloc; \
2613+
$(INSTALL_DATA) $$i $(DESTDIR)$(INCLUDEPY)/internal/mimalloc/mimalloc; \
2614+
done; \
2615+
fi
26112616
echo $(INSTALL_DATA) pyconfig.h $(DESTDIR)$(CONFINCLUDEPY)/pyconfig.h
26122617
$(INSTALL_DATA) pyconfig.h $(DESTDIR)$(CONFINCLUDEPY)/pyconfig.h
26132618

configure

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

configure.ac

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4753,6 +4753,7 @@ fi
47534753

47544754
AC_MSG_RESULT([$with_mimalloc])
47554755
AC_SUBST([WITH_MIMALLOC])
4756+
WITH_MIMALLOC=$WITH_MIMALLOC
47564757
AC_SUBST([MIMALLOC_HEADERS])
47574758

47584759
# Check for Python-specific malloc support

0 commit comments

Comments
 (0)