Changeset dc5c303 in mainline for boot/arch/arm64/meson.build

Timestamp:

2023-12-28T13:59:23Z (14 months ago)

Author:

GitHub <noreply@…>

Children:

6b66de6b

Parents:

42c2e65 (diff), f87ff8e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

boba-buba <120932204+boba-buba@…> (2023-12-28 13:59:23)

git-committer:

GitHub <noreply@…> (2023-12-28 13:59:23)

Message:

Merge branch 'master' into topic/packet-capture

File:

• boot/arch/arm64/meson.build (modified) (1 diff)

boot/arch/arm64/meson.build

@@ -48 +48 @@
         'src/main.c',
         'src/relocate.c',
+        '../../../common/stdc/mem.c',
         '../../genarch/src/efi.c',
         '../../generic/src/gzip.c',
         '../../generic/src/inflate.c',
         '../../generic/src/kernel.c',
-        '../../generic/src/memstr.c',
         '../../generic/src/payload.c',
         '../../generic/src/printf.c',
         '../../generic/src/printf_core.c',
-        '../../generic/src/str.c',
+        '../../../common/str.c',
         '../../generic/src/tar.c',
         '../../generic/src/version.c',