hopefully fix build

tombl · Dec 30, 2024 · 2c16cc2 · 2c16cc2
1 parent 4550a76
commit 2c16cc2
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/arch/wasm/Makefile b/arch/wasm/Makefile
@@ -25,9 +25,10 @@ tools/wasm/src/build/sections.json: arch/wasm/sections.json
 	$(Q)mkdir -p tools/wasm/src/build
 	$(Q)cp $< $@
 
-tools/wasm/src/build/initramfs_data.cpio: usr/initramfs_data.cpio
+tools/wasm/src/build/initramfs_data.cpio: FORCE
 	$(Q)mkdir -p tools/wasm/src/build
-	$(Q)cp $< $@
+	$(Q)$(MAKE) usr/initramfs_data.o
+	$(Q)cp usr/initramfs_inc_data $@
 
 define archhelp
   echo  '* tools/wasm       - WebAssembly host library'

diff --git a/usr/Makefile b/usr/Makefile
@@ -12,11 +12,9 @@ compress-$(CONFIG_INITRAMFS_COMPRESSION_LZO)	:= lzo
 compress-$(CONFIG_INITRAMFS_COMPRESSION_LZ4)	:= lz4
 compress-$(CONFIG_INITRAMFS_COMPRESSION_ZSTD)	:= zstd
 
-ifndef CONFIG_WASM
 obj-$(CONFIG_BLK_DEV_INITRD) := initramfs_data.o
 
 $(obj)/initramfs_data.o: $(obj)/initramfs_inc_data
-endif
 
 ramfs-input := $(CONFIG_INITRAMFS_SOURCE)
 cpio-data :=

diff --git a/usr/initramfs_data.S b/usr/initramfs_data.S
@@ -22,6 +22,8 @@
   in the ELF header, as required by certain architectures.
 */
 
+#ifndef CONFIG_WASM
+
 .section .init.ramfs,"a"
 __irf_start:
 .incbin "usr/initramfs_inc_data"
@@ -34,3 +36,5 @@ __initramfs_size:
 #else
 	.long __irf_end - __irf_start
 #endif
+
+#endif