Skip to content

Fix pkg-config search path for cmake when building wasm #169

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
brainos233 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix pkg-config search path for cmake when building wasm #169

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6b481ae
Use emmake wrapper for pkg-config in wasm
brainos233 Sep 9, 2025
c628355
Add PKG_CONFIG_PATH to build environment for emscripten
brainos233 Sep 17, 2025
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
8 changes: 6 additions & 2 deletions renpybuild/run.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,8 @@ def build_environment(c):
c.env("CFLAGS", "-O3 -I{{ install }}/include")
c.env("LDFLAGS", "-O3 -L{{install}}/lib")

c.env("PKG_CONFIG", "pkg-config --static")

c.env("PATH", "{{ host }}/bin:{{ PATH }}")

if (c.platform == "linux") and (c.arch == "x86_64"):
Expand Down Expand Up @@ -387,9 +389,13 @@ def build_environment(c):
c.env("EMSCRIPTEN_TOOLS", "{{emscriptenbin}}/tools")
c.env("EMSCRIPTEN", "{{emscriptenbin}}")

# Use emscripten's wrapper to set correct search path for .pc files.
c.env("PKG_CONFIG", "emmake pkg-config --static")

c.env("PKG_CONFIG_LIBDIR", "{{cross}}/upstream/emscripten/cache/sysroot/lib/pkgconfig:{{cross}}/upstream/emscripten/system/lib/pkgconfig")
# Add pkg-file search path for emscripten, since emscripten locked PKG_CONFIG_LIBDIR
c.env("EM_PKG_CONFIG_PATH", "{{ install }}/lib/pkgconfig")
c.env("PKG_CONFIG_PATH", "{{ EM_PKG_CONFIG_PATH }}")

# Tell emcc and em++ to use ccache when building
c.env("EM_COMPILER_WRAPPER", "/usr/bin/ccache")
Expand All @@ -406,8 +412,6 @@ def build_environment(c):
c.env("PKG_CONFIG_LIBDIR", "{{ install }}/lib/pkgconfig:{{ PKG_CONFIG_LIBDIR }}")
c.var("cmake_args", "{{cmake_args}} -DCMAKE_SYSTEM_NAME={{ cmake_system_name }} -DCMAKE_SYSTEM_PROCESSOR={{ cmake_system_processor }} -DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM=NEVER -DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=ONLY -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=ONLY -DCMAKE_FIND_ROOT_PATH_MODE_PACKAGE=ONLY")

c.env("PKG_CONFIG", "pkg-config --static")

c.env("CFLAGS", "{{ CFLAGS }} -DRENPY_BUILD")
c.env("CXXFLAGS", "{{ CFLAGS }}")

Expand Down