Skip to content
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.

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

Include correct dependency files #117

Merged
merged 1 commit into from
Aug 21, 2024
Merged

Include correct dependency files #117

merged 1 commit into from
Aug 21, 2024

Conversation

wom-bat
Copy link
Contributor

@wom-bat wom-bat commented Aug 21, 2024

When OBJECTS were moved to a different directory tree, the dependency file names were not updated.

Also depend on ${SDDF}/include so upstream Makefiles can know to initialise the submodule.

When OBJECTS were moved to a different directory tree, the dependency
file names were not updated.

Also depend on ${SDDF}/include so upstream Makefiles can know to
initialise the submodule.

Signed-off-by: Peter Chubb <[email protected]>
@@ -75,15 +76,16 @@ libvmm/arch/aarch64/vgic:
libvmm.a: ${OBJECTS}
ar rv $@ $^

${OBJECTS}: ${SDDF}/include
${OBJECTS}: ${CHECK_LIBVMM_CFLAGS} |libvmm/arch/aarch64/vgic
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
${OBJECTS}: ${CHECK_LIBVMM_CFLAGS} |libvmm/arch/aarch64/vgic
${OBJECTS}: ${CHECK_LIBVMM_CFLAGS}

should we remove |libvmm/arch/aarch64/vgic?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, it's needed to create the directory that the objects will be put into.

@Ivan-Velickovic
Copy link
Collaborator

Fixes it for me locally.

@wom-bat wom-bat merged commit 4f177f1 into main Aug 21, 2024
8 checks passed
@wom-bat wom-bat deleted the dependency-make-fix branch August 21, 2024 06:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants