Skip to content

Commit

Permalink
disk-image-{minimal,mfs-root}: Include c18n libraries
Browse files Browse the repository at this point in the history
  • Loading branch information
jrtc27 committed Aug 13, 2024
1 parent ed00235 commit 174eeb9
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions pycheribuild/projects/disk_image.py
Original file line number Diff line number Diff line change
Expand Up @@ -1161,7 +1161,7 @@ def add_unlisted_files_to_metalog(self):

self.add_required_libraries(["lib", "usr/lib"])
# Add compat libraries (may not exist if it was built with -DWITHOUT_LIB64, etc.)
for libcompat_dir in ("lib32", "lib64", "lib64c", "lib64cb", "lib128", "lib128g"):
for libcompat_dir in ("lib/c18n", "lib32", "lib64", "lib64c", "lib64cb", "lib128", "lib128g"):
fullpath = self.rootfs_dir / "usr" / libcompat_dir
if fullpath.is_symlink():
# add the libcompat symlinks to ensure that we can always use lib64/lib64c in test scripts
Expand All @@ -1171,7 +1171,7 @@ def add_unlisted_files_to_metalog(self):
if (self.rootfs_dir / libcompat_dir).is_symlink():
self.mtree.add_symlink(src_symlink=self.rootfs_dir / libcompat_dir, path_in_image=libcompat_dir)
elif (fullpath / "libc.so").exists():
ignore_required = libcompat_dir in ("lib128", "lib128g")
ignore_required = libcompat_dir in ("lib/c18n", "lib128", "lib128g")
self.add_required_libraries(["usr/" + libcompat_dir], ignore_required=ignore_required)

if self.include_cheribsdtest:
Expand Down

0 comments on commit 174eeb9

Please sign in to comment.