Changeset 436

Timestamp:

Jul 25, 2003, 3:26:54 PM (22 years ago)

Author:

bird

Message:

#564: libc linking.

File:

• trunk/src/emx/src/lib/libc.smak (modified) (4 diffs, 1 prop)

trunk/src/emx/src/lib/libc.smak

@@ -46 +46 @@
 #------------------------------------------------------
 .TKIND          := omf
-LIBC.DLL         = $.omf/libc$(VH)$(VM).dll
-LIBC.DEF         = $.omf/libc.def
-LIBC.IMPLIB      = $.omf/c_dll.lib $.aout/c_dll.a
-.OBJS           := $(patsubst %.o,%.obj,$(subst /aout/,/omf/,$(.OBJS)))
-.DEPS           := $(patsubst %.o,%.obj,$(subst /aout/,/omf/,$(.DEPS)))
-LIBC.DLL.OBJS   := $(patsubst %.o,%.obj,$(subst /aout/,/omf/,$(LIBC.DLL.OBJS)))
-.DIRS           := $(sort $(dir $(.OBJS) $(.DEPS) $(LIBC.DLL.OBJS)))
-TARGDIRS        += $(.DIRS)
+LIBC.DLL        := $.omf/libc$(VH)$(VM).dll
+LIBC.DEF        := $.omf/libc.def
+LIBC.IMPLIB     := $.omf/c_dll.lib $.aout/c_dll.a
+LIBC.OBJS       := $.omf/src/lib/startup/386/dll0.obj $.omf/src/lib/startup/dllinit.obj
+LIBC.LIBS       := $.omf/c.lib $.omf/c_app.lib
+LIBC.DEPS       := $.omf/os2stub.bin
+LIBC.DLL.OBJS   := 
+LIBC.DIRS       := $(sort $(dir $(.OBJS) $(.DEPS) $(LIBC.DLL.OBJS)))
+TARGDIRS        += $(LIBC.DIRS)
 
                         
 # LIBC linking.
-$(LIBC.DLL): $.omf/src/lib/startup/386/dll0.obj $(.OBJS) $(.DEPS) $(LIBC.DLL.OBJS) $(LIBC.DEF)
-        $(LD) -o $(@:.dll=.dbg) -Zomf $(subst -s,,$(LDFLAGS.DLL)) -nostdlib  $^ -L$.omf -los2 -lgcc -lgcc_eh -lc_alias
+#$(LIBC.DLL): $.omf/src/lib/startup/386/dll0.obj $.omf/src/lib/startup/386/dll0.obj $(.OBJS) $(.DEPS) $(LIBC.DLL.OBJS) $(LIBC.DEF)
+$(LIBC.DLL): $(LIBC.OBJS) $(LIBC.LIBS) $(LIBC.DEF) $(LIBC.DEPS)
+        $(LD) -o $(@:.dll=.dbg) -Zomf $(subst -s,,$(LDFLAGS.DLL)) -nostdlib  \
+            $(LIBC.DEF) \
+                $(LIBC.OBJS) \
+                $(LIBC.LIBS) \
+                -L$.omf -los2 -lgcc -lgcc_eh -lc_alias -lend \
+                -Zlinker -STUB:$.omf/os2stub.bin
+                
+ifeq ($(MODE),opt)
         cp $(@:.dll=.dbg) $@
-ifeq ($(MODE),opt)
-        lxlite /X /AS $@
+        lxlite /X /AS /ZS:128 $@
 endif
 
@@ -79 +87 @@
         $(call DO.EMXEXP)
 
-# LIBC libraries with dllinit hacked in (temporary only I hope).
+# LIBC libraries with dllinit.
 $(LIBC.IMPLIB): $(LIBC.DEF) $.aout/src/lib/startup/dllinit.o
         $(IMPLIB) -o $@ $<
@@ -91 +99 @@
 .PHONY: libc-dll
 all: libc-dll
-libc-dll: emxbind emxexp app alias libc os2 $(.DIRS) $(LIBC.DLL) $(LIBC.IMPLIB)
+libc-dll: emxbind emxexp app alias libc os2 $(LIBC.DIRS) $(LIBC.DLL) $(LIBC.IMPLIB)
 
 # Installation.
@@ -100 +108 @@
 $(INS)lib/$(notdir $(LIBC.DLL)): $(LIBC.DLL)
         $(call CP,$<,$@)
+
+ifeq ($(MODE),opt)
+INS.FILES       += $(INS)lib/$(notdir $(LIBC.DLL:.dll=.dbg)) 
+
 $(INS)lib/$(notdir $(LIBC.DLL:.dll=.dbg)): $(LIBC.DLL:.dll=.dbg)
         $(call CP,$<,$@)
+endif  
+
 $(addprefix $(INS)lib/,$(notdir $(LIBC.IMPLIB))): $(LIBC.IMPLIB)
         $(call CP,$^,$(dir $@))