Skip to content

[nanvix] .nanvix/config: drop dead toolchain_paths / configure_env helpers #746

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
esaurez wants to merge 1 commit into
base: feat/wave5-pr-c-unbundle-group-a
Choose a base branch
from
+0 −75
Open

[nanvix] .nanvix/config: drop dead toolchain_paths / configure_env helpers #746

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
75 changes: 0 additions & 75 deletions .nanvix/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,81 +49,6 @@
DOCKER_WORKSPACE_PATH = "/mnt/workspace"


def toolchain_paths(
toolchain: str | Path,
sysroot: str | Path,
) -> dict[str, Path]:
"""Return resolved paths to toolchain binaries and libraries."""
tc = Path(toolchain)
sr = Path(sysroot)
return {
"cc": tc / "bin" / f"{TOOLCHAIN_TRIPLET}-gcc",
"cxx": tc / "bin" / f"{TOOLCHAIN_TRIPLET}-g++",
"ld": tc / "bin" / f"{TOOLCHAIN_TRIPLET}-ld",
"ar": tc / "bin" / f"{TOOLCHAIN_TRIPLET}-ar",
"ranlib": tc / "bin" / f"{TOOLCHAIN_TRIPLET}-ranlib",
"strip": tc / "bin" / f"{TOOLCHAIN_TRIPLET}-strip",
"build_python": tc / "bin" / "python3",
"libc": tc / f"{TOOLCHAIN_TRIPLET}" / "lib" / "libc.a",
"libm": tc / f"{TOOLCHAIN_TRIPLET}" / "lib" / "libm.a",
"libposix": sr / "lib" / "libposix.a",
"libz": sr / "lib" / "libz.a",
"libsqlite3": sr / "lib" / "libsqlite3.a",
"libssl": sr / "lib" / "libssl.a",
"libcrypto": sr / "lib" / "libcrypto.a",
"liblzma": sr / "lib" / "liblzma.a",
"libnvx_crt0": sr / "lib" / "libnvx_crt0.a",
}


def configure_env(toolchain: str | Path, sysroot: str | Path) -> dict[str, str]:
"""Return the environment dict for ./configure.

NOTE: This helper is currently unused; the actual cpython build invokes
``make -f Makefile.nanvix`` which has its own inline CONFIGURE_ENV. This
function is kept in sync so a future caller does not pick up stale link
flags. See ``Makefile.nanvix`` for the authoritative comment block
explaining the ``--whole-archive`` / ``--export-dynamic`` /
``--allow-multiple-definition`` rationale.
"""
tp = toolchain_paths(toolchain, sysroot)
sr = Path(sysroot)
return {
"CC": str(tp["cc"]),
"CXX": str(tp["cxx"]),
"LD": str(tp["ld"]),
"AR": str(tp["ar"]),
"RANLIB": str(tp["ranlib"]),
"CFLAGS": (
f"-O3 -fomit-frame-pointer -fno-unwind-tables "
f"-fno-asynchronous-unwind-tables -I{sr}/include"
),
"CFLAGS_NODIST": "-fno-semantic-interposition",
"LDFLAGS": (
f"-L{sr}/lib -T{sr}/lib/user.ld "
f"-Wl,--allow-multiple-definition -no-pie "
f"-Wl,--export-dynamic -Wl,--no-dynamic-linker"
),
"LIBS": (
f"-Wl,--whole-archive {tp['libnvx_crt0']} {tp['libposix']} "
f"{tp['libc']} {tp['libm']} "
f"-lstdc++ -lgcc -Wl,--no-whole-archive "
f"-Wl,--start-group "
f"-lsqlite3 -lz -lbz2 -llzma -Wl,--end-group"
),
"LIBSQLITE3_LIBS": f"-L{sr}/lib -lsqlite3",
"LIBSQLITE3_CFLAGS": f"-I{sr}/include",
"ZLIB_LIBS": f"-L{sr}/lib -lz",
"ZLIB_CFLAGS": f"-I{sr}/include",
"BZIP2_LIBS": f"-L{sr}/lib -lbz2",
"BZIP2_CFLAGS": f"-I{sr}/include",
"LIBLZMA_LIBS": f"-L{sr}/lib -llzma",
"LIBLZMA_CFLAGS": f"-I{sr}/include",
"LIBFFI_LIBS": f"-L{sr}/lib -lffi",
"LIBFFI_CFLAGS": f"-I{sr}/include",
}


def configure_opts(
build_python: str | Path,
libc: str | Path,
Expand Down