update

[l4.git] / l4 / mk / export_defs.inc

diff --git a/l4/mk/export_defs.inc b/l4/mk/export_defs.inc
index 5cff4b5964123220d2563d41b0b38cea084cfc01..2a84e02c2ca96fc390ce35d1a93c7f6deb327d43 100644 (file)
--- a/l4/mk/export_defs.inc
+++ b/l4/mk/export_defs.inc
@@ -23,6 +23,7 @@ ifneq ($(SYSTEM),)
 L4_SYSTEM                    = $(ARCH)_$(CPU)
 L4_CC                        = $(CC)
 L4_CXX                       = $(CXX)
+L4_LD                        = $(LD)
 L4_CRT0_STATIC               = $(CRT0)
 L4_CRTN_STATIC               = $(CRTN)
 L4_LDFLAGS_LD_STATIC         = $(filter-out -l%,$(BID_LDFLAGS_FOR_LINKING_LD))
@@ -34,6 +35,7 @@ L4_CPPFLAGS                  = $(CPPFLAGS)
 L4_CFLAGS                    = $(CFLAGS)
 L4_CXXFLAGS                  = $(CXXFLAGS)
 L4_GCCLIB                    = $(GCCLIB)
+L4_GCCLIB_SO                 = $(GCCLIB_SO)
 L4_GCCLIB_EH                 = $(GCCLIB_EH)
 L4_LDS_stat_bin              = $(LDS_stat_bin)
 L4_BID_STACK_ADDR            = $(L4_STACK_ADDR)
@@ -70,6 +72,7 @@ all::
        @$(call do_output_all,L4_SYSTEM)
        @$(call do_output_all,L4_CC)
        @$(call do_output_all,L4_CXX)
+       @$(call do_output_all,L4_LD)
        @$(call do_output_all,L4_CRT0_STATIC)
        @$(call do_output_all,L4_CRTN_STATIC)
        @$(call do_output_all,L4_LDFLAGS_LD_STATIC)
@@ -101,6 +104,7 @@ include $(L4DIR)/mk/prog.mk
 
 endif # called for static
 
+#   ----------------------------------------------------
 
 ifeq ($(CALLED_FOR),shared)
 
@@ -110,16 +114,12 @@ ifneq ($(SYSTEM),)
 
 L4_LDFLAGS_LD_SHARED  = $(filter-out -l%,$(BID_LDFLAGS_FOR_LINKING_LD))
 L4_LDFLAGS_GCC_SHARED = $(filter-out -l%,$(BID_LDFLAGS_FOR_LINKING_GCC))
-L4_CRT0_DYN           = $(CRT0_all_lib)
-L4_CRTN_DYN           = $(CRTN_all_lib)
 L4_LDS_so             = $(LDS_so)
 L4_LDS_dyn_bin        = $(LDS_dyn_bin)
 
 all::
        @$(call do_output_all,L4_LDFLAGS_LD_SHARED)
        @$(call do_output_all,L4_LDFLAGS_GCC_SHARED)
-       @$(call do_output_all,L4_CRT0_DYN)
-       @$(call do_output_all,L4_CRTN_DYN)
        @$(call do_output_all,L4_LDS_so)
        @$(call do_output_all,L4_LDS_dyn_bin)
 
@@ -130,3 +130,24 @@ endif
 include $(L4DIR)/mk/prog.mk
 
 endif # called for shared
+
+#   ----------------------------------------------------
+
+ifeq ($(CALLED_FOR),sharedlib)
+
+ifneq ($(SYSTEM),)
+
+NOTARGETSTOINSTALL = y
+L4_CRT0_SO = $(CRT0)
+L4_CRTN_SO = $(CRTN)
+
+all::
+       @$(call do_output_all,L4_CRT0_SO)
+       @$(call do_output_all,L4_CRTN_SO)
+else
+all::
+endif
+
+include $(L4DIR)/mk/lib.mk
+
+endif # called for sharedlib