lx_hybrid_ctors: remove 'soname' link option
This patch removes the 'soname' link option for building the host library for the 'lx_hybrid_ctors' test. Without this option, the library's absolute path at build time gets hardcoded into the application, which should be okay for this simple test case. Fixes #638.
This commit is contained in:
parent
b530fddf86
commit
cecfbf2eb4
|
@ -39,13 +39,10 @@ install_config {
|
||||||
# Boot modules
|
# Boot modules
|
||||||
#
|
#
|
||||||
|
|
||||||
exec cp test/lx_hybrid_ctors/libtestlib.so bin/
|
|
||||||
|
|
||||||
# generic modules
|
# generic modules
|
||||||
set boot_modules {
|
set boot_modules {
|
||||||
core init
|
core init
|
||||||
test-lx_hybrid_ctors
|
test-lx_hybrid_ctors
|
||||||
libtestlib.so
|
|
||||||
}
|
}
|
||||||
|
|
||||||
build_boot_image $boot_modules
|
build_boot_image $boot_modules
|
||||||
|
@ -54,9 +51,6 @@ build_boot_image $boot_modules
|
||||||
# Execute test case
|
# Execute test case
|
||||||
#
|
#
|
||||||
|
|
||||||
# qemu config
|
|
||||||
append qemu_args "-nographic -m 64 "
|
|
||||||
|
|
||||||
run_genode_until "child exited with exit value 0.*\n" 10
|
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 ---
|
[init -> test-lx_hybrid_ctors] --- returning from main ---
|
||||||
}
|
}
|
||||||
|
|
||||||
exec rm bin/libtestlib.so
|
|
||||||
|
|
||||||
# vi: set ft=tcl :
|
# vi: set ft=tcl :
|
||||||
|
|
|
@ -2,17 +2,17 @@ TARGET = test-lx_hybrid_ctors
|
||||||
SRC_CC = main.cc
|
SRC_CC = main.cc
|
||||||
LIBS = env lx_hybrid
|
LIBS = env lx_hybrid
|
||||||
|
|
||||||
EXT_OBJECTS += $(BUILD_BASE_DIR)/test/lx_hybrid_ctors/libtestlib.so
|
|
||||||
|
|
||||||
TESTLIB_SO = libtestlib.so
|
TESTLIB_SO = libtestlib.so
|
||||||
TESTLIB_SRC_CC = testlib.cc
|
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)
|
$(TESTLIB_SO): $(TESTLIB_SRC_CC)
|
||||||
$(MSG_BUILD)$(TESTLIB_SO)
|
$(MSG_BUILD)$(TESTLIB_SO)
|
||||||
$(VERBOSE)g++ -fPIC -c $^
|
$(VERBOSE)g++ -fPIC -c $^
|
||||||
$(VERBOSE)g++ -shared -Wlsoname,$(TESTLIB_SO) -o $@ $(notdir $(^:.cc=.o))
|
$(VERBOSE)g++ -shared -o $@ $(notdir $(^:.cc=.o))
|
||||||
|
|
||||||
clean_libtestlib:
|
clean_libtestlib:
|
||||||
$(VERBOSE)rm -f $(TESTLIB_SO) $(TESTLIB_SRC_CC:.cc=.o)
|
$(VERBOSE)rm -f $(TESTLIB_SO) $(TESTLIB_SRC_CC:.cc=.o)
|
||||||
|
|
Loading…
Reference in New Issue