Don't try to generate moddep.lst on any-emu.rmk

diff --git a/conf/any-emu.rmk b/conf/any-emu.rmk
index 983dc2c1fbbc9ecc74d6ab1dac047e8c798ca09e..7ed5fa74b5accc4de6b1deb783858f6f993d802c 100644 (file)
--- a/conf/any-emu.rmk
+++ b/conf/any-emu.rmk
@@ -24,6 +24,7 @@ kernel_img_SOURCES = kern/device.c kern/disk.c kern/dl.c  kern/env.c  \
 kernel_img_CFLAGS = $(CPPFLAGS) $(CFLAGS) -DGRUB_UTIL=1
 kernel_img_LDFLAGS = $(COMMON_LDFLAGS)
 TARGET_NO_STRIP = yes
+TARGET_NO_DYNAMIC_MODULES = yes
 
 # For hostfs.mod.
 pkglib_MODULES += hostfs.mod

diff --git a/genmk.rb b/genmk.rb
index 65bcb3ddd62fbfde1ecde55fb72b320f501eb689..7df15043aea884e78a874bb138c9f997723fd0a4 100644 (file)
--- a/genmk.rb
+++ b/genmk.rb
@@ -143,6 +143,13 @@ mostlyclean-module-#{@name}.#{@rule_count}:
 MOSTLYCLEAN_MODULE_TARGETS += mostlyclean-module-#{@name}.#{@rule_count}
 UNDSYMFILES += #{undsym}
 
+ifeq ($(TARGET_NO_DYNAMIC_MODULES), yes)
+#{@name}: #{pre_obj} $(TARGET_OBJ2ELF)
+       -rm -f $@
+       $(TARGET_CC) $(#{prefix}_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ #{pre_obj}
+       if test ! -z \"$(TARGET_OBJ2ELF)\"; then ./$(TARGET_OBJ2ELF) $@ || (rm -f $@; exit 1); fi
+       if test x$(TARGET_NO_STRIP) != xyes ; then $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -K _grub_mod_init -K _grub_mod_fini -R .note -R .comment $@; fi
+else
 ifneq ($(TARGET_APPLE_CC),1)
 #{@name}: #{pre_obj} #{mod_obj} $(TARGET_OBJ2ELF)
        -rm -f $@
@@ -157,6 +164,7 @@ else
        $(OBJCONV) -f$(TARGET_MODULE_FORMAT) -nr:_grub_mod_init:grub_mod_init -nr:_grub_mod_fini:grub_mod_fini -wd1106 -nu -nd $@.bin $@
        -rm -f $@.bin
 endif
+endif
 
 #{pre_obj}: $(#{prefix}_DEPENDENCIES) #{objs_str}
        -rm -f $@