mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-04-30 03:40:34 +02:00
Code Activity

Update for changes to Whippet build

Browse source 
* libguile/Makefile.am (WHIPPET_EMBEDDER_H): Define this variable
instead of using -include; otherwise we don't get the chance to set
_LARGEFILE64_SOURCE before including Whippet files.
(AM_CPPFLAGS): Simplify.
(libguile_@GUILE_EFFECTIVE_VERSION@_la_DEPENDENCIES): Explicitly add
libwhippet.la as a dependency.
(noinst_HEADERS): Add gc-internal.h
* libguile/gc-internal.h: New file.
* libguile/gc.c: Include gc-internal.h.
This commit is contained in:
Andy Wingo 2025-04-16 13:48:36 +02:00
parent fd7b5d2d0c
commit 2d5d9f6ba9
3 changed files with 35 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
libguile/Makefile.am
View file

@ -26,7 +26,7 @@ include $(top_srcdir)/am/snarf
include lightening/lightening.am include lightening/lightening.am
include whippet/embed.am include whippet/embed.am
WHIPPET_EMBEDDER_CPPFLAGS = -include $(srcdir)/whippet-embedder.h WHIPPET_EMBEDDER_H = $(srcdir)/whippet-embedder.h
AUTOMAKE_OPTIONS = gnu AUTOMAKE_OPTIONS = gnu
@ -44,7 +44,7 @@ DEFAULT_INCLUDES =
AM_CPPFLAGS = -DBUILDING_LIBGUILE=1 -I$(top_srcdir) -I$(top_builddir) \ AM_CPPFLAGS = -DBUILDING_LIBGUILE=1 -I$(top_srcdir) -I$(top_builddir) \
-I$(top_srcdir)/lib -I$(top_builddir)/lib -iquote$(builddir) \ -I$(top_srcdir)/lib -I$(top_builddir)/lib -iquote$(builddir) \
$(LIBFFI_CFLAGS) $(LIBFFI_CFLAGS)
#AM_CPPFLAGS += $(WHIPPET_CPPFLAGS) $(WHIPPET_CFLAGS) $(WHIPPET_TO_EMBEDDER_CPPFLAGS) AM_CPPFLAGS += $(WHIPPET_CPPFLAGS)
if ENABLE_JIT if ENABLE_JIT
AM_CPPFLAGS += -I$(top_srcdir)/libguile/lightening AM_CPPFLAGS += -I$(top_srcdir)/libguile/lightening
@ -539,6 +539,7 @@ noinst_HEADERS = custom-ports.h \
quicksort.i.c \ quicksort.i.c \
atomics-internal.h \ atomics-internal.h \
cache-internal.h \ cache-internal.h \
gc-internal.h \
posix-w32.h \ posix-w32.h \
private-options.h \ private-options.h \
ports-internal.h \ ports-internal.h \
@ -549,7 +550,7 @@ noinst_HEADERS = custom-ports.h \
# vm instructions # vm instructions
noinst_HEADERS += vm-engine.c noinst_HEADERS += vm-engine.c
libguile_@GUILE_EFFECTIVE_VERSION@_la_DEPENDENCIES = @LIBLOBJS@ libguile_@GUILE_EFFECTIVE_VERSION@_la_DEPENDENCIES = @LIBLOBJS@ libwhippet.la
libguile_@GUILE_EFFECTIVE_VERSION@_la_LIBADD = \ libguile_@GUILE_EFFECTIVE_VERSION@_la_LIBADD = \
@LIBLOBJS@ $(gnulib_library) $(LTLIBGMP) $(LTLIBLTDL) libwhippet.la @LIBLOBJS@ $(gnulib_library) $(LTLIBGMP) $(LTLIBLTDL) libwhippet.la

28
libguile/gc-internal.h Normal file
View file

@ -0,0 +1,28 @@
#ifndef SCM_GC_INTERNAL_H
#define SCM_GC_INTERNAL_H
/* Copyright 2025 Free Software Foundation, Inc.
This file is part of Guile.
Guile is free software: you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published
by the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
Guile is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
License for more details.
You should have received a copy of the GNU Lesser General Public
License along with Guile. If not, see
<https://www.gnu.org/licenses/>. */
#include <gc-api.h>
#endif /* SCM_GC_INTERNAL_H */

4
libguile/gc.c
View file

@ -1,4 +1,4 @@
/* Copyright 1995-2003,2006,2008-2014,2016-2018,2020,2024 /* Copyright 1995-2003,2006,2008-2014,2016-2018,2020,2024-2025
Free Software Foundation, Inc. Free Software Foundation, Inc.
This file is part of Guile. This file is part of Guile.
@ -59,6 +59,8 @@
#endif #endif
#include "gc.h" #include "gc.h"
#include "gc-internal.h"
/* For GC_set_start_callback. */ /* For GC_set_start_callback. */
#include <gc/gc_mark.h> #include <gc/gc_mark.h>