Merge pull request #450 from ruby/pr-2fcb4e784ebc17ba2ab007511987950b…

…1e020b25 PIC support in js gem
ruby · May 5, 2024 · 3cd8627 · 3cd8627
2 parents 148b81c + 0d9b427
commit 3cd8627
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/packages/gems/js/ext/js/depend b/packages/gems/js/ext/js/depend
@@ -14,4 +14,5 @@ bindgen/legacy/%.o: $(srcdir)/bindgen/legacy/%.c
 
 bindgen/ext.o: $(srcdir)/bindgen/ext.c
 	@mkdir -p "$(@D)"
-	$(CC) -c -o $@ $<
+	$(ECHO) compiling $(<)
+	$(Q) $(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) $(COUTFLAG)$@ -c $(CSRCFLAG)$<
diff --git a/packages/gems/js/ext/js/extconf.rb b/packages/gems/js/ext/js/extconf.rb
@@ -19,7 +19,16 @@
   $objs << "bindgen/legacy/rb-js-abi-host.o"
   $objs << "bindgen/legacy/rb-abi-guest.o"
 end
+
+component_type_obj = "$(srcdir)/bindgen/ext_component_type.o"
+
+unless $static
+  # When building shared library, we need to link the component type object
+  # to the shared library instead of the main ruby executable.
+  $libs << component_type_obj
+end
+
 create_makefile("js") do |mk|
-  mk << "EXTRA_OBJS = $(srcdir)/bindgen/ext_component_type.o\n" if use_component_model
+  mk << "EXTRA_OBJS = #{component_type_obj}\n" if use_component_model
   mk
 end
diff --git a/packages/gems/js/ext/js/witapi-core.c b/packages/gems/js/ext/js/witapi-core.c
@@ -363,10 +363,15 @@ static inline void __wasm_call_ctors_if_needed(void) {
     __wasm_call_ctors_done = true;
     __wasm_call_ctors();
 
+    // Initialize VFS runtime if it's used
+    // NOTE: We don't use wasi-vfs for PIC build. Instead, we use
+    // Component Model-native wasi-virt.
+#  ifndef __PIC__
     __attribute__((weak)) extern void __wasi_vfs_rt_init(void);
     if (__wasi_vfs_rt_init) {
       __wasi_vfs_rt_init();
     }
+#  endif
   }
 }