Get rid of EXTRA_LDFLAGS (refs #142 and #173)

Author: geofft

hello-world/Makefile

@@ -1,8 +1,10 @@
 obj-m := helloworld.o
-helloworld-objs := target/x86_64-linux-kernel-module/debug/libhello_world.a
-EXTRA_LDFLAGS += --entry=init_module
+helloworld-objs := hello_world.rust.o
 KDIR ?= /lib/modules/$(shell uname -r)/build
 
+%.rust.o: target/x86_64-linux-kernel-module/debug/lib%.a
+	$(LD) -r -o $@ --whole-archive $<
+
 all:
 	$(MAKE) -C $(KDIR) M=$(CURDIR)
 

tests/Makefile

@@ -1,8 +1,10 @@
 obj-m := testmodule.o
-testmodule-objs := $(TEST_LIBRARY)
-EXTRA_LDFLAGS += --entry=init_module
+testmodule-objs := $(TEST_NAME).rust.o
 KDIR ?= /lib/modules/$(shell uname -r)/build
 
+%.rust.o: target/x86_64-linux-kernel-module/debug/lib%.a
+	$(LD) -r -o $@ --whole-archive $<
+
 all:
 	$(MAKE) -C $(KDIR) M=$(CURDIR)
 

tests/run_tests.py

@@ -45,9 +45,7 @@ def main():
 
         run(
             "make", "-C", BASE_DIR,
-            "TEST_LIBRARY=target/x86_64-linux-kernel-module/debug/lib{}_tests.a".format(
-                path.replace("-", "_")
-            ),
+            "TEST_NAME={}_tests".format(path.replace("-", "_")),
         )
         # TODO: qemu
         run(