Skip to content

Never export emscripten generated invoke_ functions #56

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Schroedi wants to merge 1 commit into
base: REL_17_5_WASM-pglite-builder
Choose a base branch
from
Open

Never export emscripten generated invoke_ functions #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 0 additions & 32 deletions pglite-wasm/excluded.pglite.imports
View file
Open in desktop

This file was deleted.

12 changes: 10 additions & 2 deletions src/backend/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,12 +92,20 @@ postgres: $(OBJS)

# Extensions use functions from the core PG. These need to be exported by the emscripten compiler.
# The following target gathers all extension imports + the default ones (included.pglite.imports),
# excludes the one in excluded.pglite.imports and adds a leading _ to each.
# excludes (invoke_* and __indirect_function_table) (Emscripten runtime trampolines)
# exlcudes defined excludes, libpq exports, and libossp-uuid exports
# and adds a leading _ to each.
pglite-exported-functions:
$(MKDIR_P) '$(emscripten_imports_dir)'
cat $(top_builddir)/pglite-wasm/excluded.*.imports $(top_builddir)/src/interfaces/libpq/exports.list $(LIB_EXPORTS_DIR)/libossp-uuid.exports | sort -u > '$(top_builddir)/pglite-wasm/excluded.imports'
@# Build the exclusion list
cat $(top_builddir)/src/interfaces/libpq/exports.list $(LIB_EXPORTS_DIR)/libossp-uuid.exports | sort -u > '$(top_builddir)/pglite-wasm/excluded.imports'
@# Generate exported_functions.txt:
@# 1. Filter out invoke_* and __indirect_function_table (Emscripten runtime, never export)
@# 2. Filter out symbols in excluded.imports (build in previous step)
@# 3. Add underscore prefix
cat $(DESTDIR)$(emscripten_extension_imports_dir)/*.imports '$(top_builddir)/pglite-wasm/included.pglite.imports' | \
sort -u | \
grep -v -E '^(invoke_|__indirect_function_table)' | \
grep -Fvx -f '$(top_builddir)/pglite-wasm/excluded.imports' | \
sed 's/^/_/' \
> '$(emscripten_imports_dir)/exported_functions.txt'
Expand Down