SarasasChipWorkshop/sarasacw-omrf
1
0
Fork 0
Code Activity

fix: fix lib artifact path issue

Browse Source
This commit is contained in:
yyc12345
2026-08-06 09:36:38 +08:00
parent dbec1b4fca
commit 7527d3763f
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packer/README.md
+1
View File
@@ -56,3 +56,4 @@ description = "a brown fox jumps over a lazy dog."
## Environment Variables ## Environment Variables
- `OMRF_PACKER_CARGO`: Path to the `cargo` executable used to collect project metadata. When unset, the packer invokes `cargo` as resolved from `PATH`. - `OMRF_PACKER_CARGO`: Path to the `cargo` executable used to collect project metadata. When unset, the packer invokes `cargo` as resolved from `PATH`.
- `OMRF_PACKER_RUSTC`: Path to the `rustc` executable used to resolve the host toolchain triple. When unset, the packer invokes `rustc` as resolved from `PATH`.
packer/src/sarasacw_omrf_packer/artifact.py
+6 -1
View File
@@ -165,7 +165,6 @@ def _generate_lib_artifact_name(name: str, _: Triple) -> str:
def resolve_lib_copy(ctx: ArtifactContext) -> Iterator[FileCopyInfo]: def resolve_lib_copy(ctx: ArtifactContext) -> Iterator[FileCopyInfo]:
"""Yield :class:`FileCopyInfo` for the built dynamic library (and, on Windows, the import library).""" """Yield :class:`FileCopyInfo` for the built dynamic library (and, on Windows, the import library)."""
extractor = ctx.extractor extractor = ctx.extractor
target_directory = extractor.get_target_directory() / "release"
target_name = extractor.get_target_name() target_name = extractor.get_target_name()
# get triple info # get triple info
@@ -173,6 +172,12 @@ def resolve_lib_copy(ctx: ArtifactContext) -> Iterator[FileCopyInfo]:
if ctx.options.target is not None: if ctx.options.target is not None:
target_triple = ctx.options.target target_triple = ctx.options.target
# compute target directory
target_directory = extractor.get_target_directory()
if ctx.options.target is not None:
target_directory /= str(ctx.options.target)
target_directory /= "release"
# copy artifact for redist # copy artifact for redist
dll_artifact_filename = _generate_dll_artifact_name(target_name, target_triple) dll_artifact_filename = _generate_dll_artifact_name(target_name, target_triple)
yield FileCopyInfo( yield FileCopyInfo(