Changeset 751

Timestamp:

Sep 29, 2003, 11:17:05 PM (22 years ago)

Author:

bird

Message:

Made the damn thing work without building the tools.

Location:

trunk/src/emx

Files:

• Makefile (modified) (2 diffs, 1 prop)
• src/lib/libc.smak (modified) (5 diffs, 1 prop)
• src/lib/startup/startup.smak (modified) (1 diff, 1 prop)

trunk/src/emx/Makefile

@@ -134 +134 @@
 
 # emxbind tool
-EMXBIND = $(call GETTOOL,emxbind)
+EMXBIND = $(call GETTOOL2,emxbind)
 # emxbind flags
 EMXBINDFLAGS = -bq $(EMXBINDFLAGS.$(MODE))
@@ -161 +161 @@
 # removing unused stuff (like empty lines and comments)
 # and sorting alphabetically (looks nicer).
-EMXEXP = $(call GETTOOL,emxexp)
+EMXEXP = $(call GETTOOL2,emxexp)
 EMXEXPFLAGS = -u
 DO.EMXEXP = $(EMXEXP) $(strip $(EMXEXPFLAGS) $1) | sed -e "/^$$/d" -e "/^ *;/d" | sort -d >>$2
 
 # The tool to create import libraries
-IMPLIB = $(call GETTOOL,emximp)
+IMPLIB = $(call GETTOOL2,emximp)
 IMPLIBFLAGS.prof = -m
 IMPLIBFLAGS.KIND = $(foreach x,$(subst -, ,$(firstword $(subst /, ,$(subst $.,,$@)))),$(IMPLIBFLAGS.$x))

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

@@ -46 +46 @@
 #------------------------------------------------------
 .TKIND          := omf
+LIBC.STUB               := $(wildcard $.omf/os2stub.bin)
+LIBC.STUBARG    := $(if $(LIBC.STUB),-Zlinker -STUB:$(LIBC.STUB))
 LIBC.DLL        := $.omf/libc$(VH)$(VM).dll
 LIBC.IMPLIB     := $.omf/c_dll.lib $.aout/c_dll.a
@@ -51 +53 @@
 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 $.omf/c_alias.lib
+LIBC.DEPS       := $(LIBC.STUB) $.omf/c_alias.lib
 LIBC.DLL.OBJS   :=
 LIBC.DIRS       := $(sort $(dir $(LIBC.OBJS) $(LIBC.DEPS) $(LIBC.DLL.OBJS)))
@@ -78 +80 @@
                 $(LIBC.OBJS) \
                 $(LIBC.LIBS) \
-                -L$.omf -los2 -lgcc -lgcc_eh -lc_alias -lend \
-                -Zlinker -STUB:$.omf/os2stub.bin
+                -L$.omf -los2 -lgcc -lgcc_eh -lc_alias -lend $(LIBC.STUBARG)
 ifeq ($(MODE),opt)      
         cp $@ $(@:.dll=.dbg)
@@ -110 +111 @@
                 $(LIBC.PRF.OBJS) \
                 $(LIBC.PRF.LIBS) \
-                -L$.omf -los2 -lgcc -lgcc_eh -lc_alias -lend \
-                -Zlinker -STUB:$.omf/os2stub.bin
+                -L$.omf -los2 -lgcc -lgcc_eh -lc_alias -lend $(LIBC.STUBARG)
         echo $@         
 
@@ -131 +131 @@
                 $(LIBC.ELH.OBJS) \
                 $(LIBC.ELH.LIBS) \
-                -L$.omf -los2 -lgcc -lgcc_eh -lc_alias -lend \
-                -Zlinker -STUB:$.omf/os2stub.bin
+                -L$.omf -los2 -lgcc -lgcc_eh -lc_alias -lend $(LIBC.STUBARG)
         echo $@         
 

trunk/src/emx/src/lib/startup/startup.smak

@@ -27 +27 @@
         $(CC) $(CFLAGS) -x assembler-with-cpp -DMCRT0 -o tmp1.o $<
         $(CC) $(CFLAGS) -o tmp2.o src/lib/startup/gmon.c
-        $.$(TOOLFMT)/ld$E -r -o $@ tmp1.o tmp2.o
+        $(call GETTOOL2,ld) -r -o $@ tmp1.o tmp2.o
         $(call RM,tmp1.o tmp2.o)