Build dynamically linked executables by default

Fixes #2184
2016-12-01 19:00:11 +01:00
parent d882277ce3
commit ccffbb0dfc
190 changed files with 227 additions and 199 deletions
--- a/repos/base-foc/lib/mk/base-foc-common.inc
+++ b/repos/base-foc/lib/mk/base-foc-common.inc
--- a/repos/base-foc/lib/mk/base-foc.inc
+++ b/repos/base-foc/lib/mk/base-foc.inc
@@ -1,4 +1,5 @@
 include $(BASE_DIR)/lib/mk/base.inc

+LIBS   += base-foc-common
 SRC_CC += cap_map_remove.cc cap_alloc.cc
 SRC_CC += thread_start.cc
--- a/repos/base-foc/lib/mk/core.inc
+++ b/repos/base-foc/lib/mk/core.inc
@@ -2,7 +2,7 @@ REQUIRES    += foc

 GEN_CORE_DIR = $(BASE_DIR)/src/core

-LIBS        += base-common
+LIBS        += base-foc-common

 SRC_CC      += stack_area.cc \
               core_log.cc \
--- a/repos/base-foc/lib/mk/spec/arm/base-foc-common.mk
+++ b/repos/base-foc/lib/mk/spec/arm/base-foc-common.mk
@@ -1,4 +1,4 @@
 # override default stack-area location
 INC_DIR += $(REP_DIR)/src/include/spec/arm

-include $(REP_DIR)/lib/mk/base-common.inc
+include $(REP_DIR)/lib/mk/base-foc-common.inc
--- a/repos/base-foc/lib/mk/spec/arm/base-foc.mk
+++ b/repos/base-foc/lib/mk/spec/arm/base-foc.mk
@@ -1,4 +1,4 @@
 # override default stack-area location
 INC_DIR += $(REP_DIR)/src/include/spec/arm

-include $(REP_DIR)/lib/mk/base.inc
+include $(REP_DIR)/lib/mk/base-foc.inc
--- a/repos/base-foc/lib/mk/spec/arm/ld.mk
+++ b/repos/base-foc/lib/mk/spec/arm/ld.mk
@@ -0,0 +1,3 @@
+BASE_LIBS += base-foc-common base-foc
+
+include $(BASE_DIR)/lib/mk/spec/arm/ld.inc
--- a/repos/base-foc/lib/mk/spec/x86/base-common.mk
+++ b/repos/base-foc/lib/mk/spec/x86/base-common.mk
@@ -1 +0,0 @@
-include $(REP_DIR)/lib/mk/base-common.inc
--- a/repos/base-foc/lib/mk/spec/x86/base-foc-common.mk
+++ b/repos/base-foc/lib/mk/spec/x86/base-foc-common.mk
@@ -0,0 +1 @@
+include $(REP_DIR)/lib/mk/base-foc-common.inc
--- a/repos/base-foc/lib/mk/spec/x86/base-foc.mk
+++ b/repos/base-foc/lib/mk/spec/x86/base-foc.mk
@@ -0,0 +1 @@
+include $(REP_DIR)/lib/mk/base-foc.inc
--- a/repos/base-foc/lib/mk/spec/x86/base.mk
+++ b/repos/base-foc/lib/mk/spec/x86/base.mk
@@ -1 +0,0 @@
-include $(REP_DIR)/lib/mk/base.inc
--- a/repos/base-foc/lib/mk/spec/x86_32/ld.mk
+++ b/repos/base-foc/lib/mk/spec/x86_32/ld.mk
@@ -0,0 +1,3 @@
+BASE_LIBS += base-foc-common base-foc
+
+include $(BASE_DIR)/lib/mk/spec/x86_32/ld.inc
--- a/repos/base-foc/lib/mk/spec/x86_64/ld.mk
+++ b/repos/base-foc/lib/mk/spec/x86_64/ld.mk
@@ -0,0 +1,3 @@
+BASE_LIBS += base-foc-common base-foc
+
+include $(BASE_DIR)/lib/mk/spec/x86_64/ld.inc
--- a/repos/base-foc/run/cap_integrity.run
+++ b/repos/base-foc/run/cap_integrity.run
@@ -21,7 +21,7 @@ install_config {
 	</config>
 }

-build_boot_image "core init test-cap_integrity"
+build_boot_image "core ld.lib.so init test-cap_integrity"

 append qemu_args "-nographic -m 64"
				`@@ -0,0 +1 @@`
				`include $(REP_DIR)/lib/mk/base-foc-common.inc`