diff --git a/base-linux/run/lx_hybrid_ctors.run b/base-linux/run/lx_hybrid_ctors.run index 7b52ad4d4e..ad9cac2e34 100644 --- a/base-linux/run/lx_hybrid_ctors.run +++ b/base-linux/run/lx_hybrid_ctors.run @@ -39,13 +39,10 @@ install_config { # Boot modules # -exec cp test/lx_hybrid_ctors/libtestlib.so bin/ - # generic modules set boot_modules { core init test-lx_hybrid_ctors - libtestlib.so } build_boot_image $boot_modules @@ -54,9 +51,6 @@ build_boot_image $boot_modules # Execute test case # -# qemu config -append qemu_args "-nographic -m 64 " - run_genode_until "child exited with exit value 0.*\n" 10 # @@ -72,6 +66,4 @@ compare_output_to { [init -> test-lx_hybrid_ctors] --- returning from main --- } -exec rm bin/libtestlib.so - # vi: set ft=tcl : diff --git a/base-linux/src/test/lx_hybrid_ctors/target.mk b/base-linux/src/test/lx_hybrid_ctors/target.mk index 3125dfea42..c68e6a0086 100644 --- a/base-linux/src/test/lx_hybrid_ctors/target.mk +++ b/base-linux/src/test/lx_hybrid_ctors/target.mk @@ -2,17 +2,17 @@ TARGET = test-lx_hybrid_ctors SRC_CC = main.cc LIBS = env lx_hybrid -EXT_OBJECTS += $(BUILD_BASE_DIR)/test/lx_hybrid_ctors/libtestlib.so - TESTLIB_SO = libtestlib.so TESTLIB_SRC_CC = testlib.cc -$(TARGET): libtestlib.so +EXT_OBJECTS += $(BUILD_BASE_DIR)/test/lx_hybrid_ctors/$(TESTLIB_SO) + +$(TARGET): $(TESTLIB_SO) $(TESTLIB_SO): $(TESTLIB_SRC_CC) $(MSG_BUILD)$(TESTLIB_SO) $(VERBOSE)g++ -fPIC -c $^ - $(VERBOSE)g++ -shared -Wlsoname,$(TESTLIB_SO) -o $@ $(notdir $(^:.cc=.o)) + $(VERBOSE)g++ -shared -o $@ $(notdir $(^:.cc=.o)) clean_libtestlib: $(VERBOSE)rm -f $(TESTLIB_SO) $(TESTLIB_SRC_CC:.cc=.o)