diff options
| author | dzwdz | 2022-08-13 16:21:02 +0200 |
|---|---|---|
| committer | dzwdz | 2022-08-13 16:21:02 +0200 |
| commit | 57427191e2cf0f08724b74fba3a35aa41ceda40d (patch) | |
| tree | e78b02cfd05d978772cc8dfff8de1cb4791c8021 /Makefile | |
| parent | 1528e2153dfbd729916f1211a6f481a2171f855f (diff) | |
user: plan9-style /bin/ union
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -90,10 +90,10 @@ out/hdd: define userbin_template = -out/initrd/bin/$(1): src/user/linker.ld \ - $(call from_sources, src/user/app/$(1)/) \ - $(call from_sources, src/user/lib/) \ - $(call from_sources, src/shared/) +out/initrd/bin/amd64/$(1): src/user/linker.ld \ + $(call from_sources, src/user/app/$(1)/) \ + $(call from_sources, src/user/lib/) \ + $(call from_sources, src/shared/) @mkdir -p $$(@D) @$(CC) $(LFLAGS) -Wl,-pie -Wl,-no-dynamic-linker -T $$^ -o $$@ endef @@ -108,7 +108,7 @@ out/initrd/font.psf: /usr/share/kbd/consolefonts/default8x16.psfu.gz @gunzip $< -c > $@ out/initrd.tar: $(patsubst %,out/%,$(shell find initrd/ -type f)) \ - $(patsubst %,out/initrd/bin/%,$(USERBINS)) \ + $(patsubst %,out/initrd/bin/amd64/%,$(USERBINS)) \ out/initrd/font.psf @cd out/initrd; tar chf ../initrd.tar * |