Ticket #365: makefiles.diff

src/ld/ld.smak

@@ -26 +26 @@
 .TDEP   := src/ld/ldstub.def
 # link386 -> ilink
 #.TLDF  := -nostdlib -los2 -s -Zlinker /align:1 -Zlinker /nosectoraligncode
-ifeq ($(EMXOMFLD_TYPE),wlink)
+ifneq ($(filter wlink WLINK,$(EMXOMFLD_TYPE)),)
 .TLDF   := -nostdlib -los2 -lend -s -Zlinker "OPTION ALIGN=4096"
 else # ilink:
 .TLDF   := -nostdlib -los2 -lend -s -Zlinker /align:1

src/lib/alias/alias.smak

@@ -43 +43 @@
                 else \
                         echo "Aliasing _$$fun1 to _$$fun ..."; \
                         echo ".stabs \"_$${fun1}\",11,0,0,0;.stabs \"_$${fun}\",1,0,0,0;" > $.aliases/_$$fun1.s; \
-                        if as -o $.aliases/_$$fun1.o $.aliases/_$$fun1.s; then \
+                        if as -o $.aliases/_$$fun1.o $.aliases/_$$fun1.s; then : \
                         else exit 1; \
                         fi; \
                         fun1=; \
@@ -53 +53 @@
         for i in $(ALIAS.FUNCS); do \
                 echo "Aliasing _$$i to __std_$$i ..."; \
         echo ".stabs \"_$$i\",11,0,0,0;.stabs \"__std_$$i\",1,0,0,0;" > $.aliases/_$$i.s; \
-        if test -f $.aliases/_$$i.o || as -o $.aliases/_$$i.o $.aliases/_$$i.s; then \
+        if test -f $.aliases/_$$i.o || as -o $.aliases/_$$i.o $.aliases/_$$i.s; then : \
                 else exit 1; \
                 fi \
         done
         for i in $(ALIAS._FUNCS); do \
                 echo "Aliasing __$$i to __std_$$i ..."; \
                 echo ".stabs \"__$$i\",11,0,0,0;.stabs \"__std_$$i\",1,0,0,0;" > $.aliases/__$$i.s; \
-                if test -f $.aliases/__$$i.o || as -o $.aliases/__$$i.o $.aliases/__$$i.s; then \
+                if test -f $.aliases/__$$i.o || as -o $.aliases/__$$i.o $.aliases/__$$i.s; then : \
                 else exit 1; \
                 fi \
         done

src/lib/libc.smak

@@ -207 +207 @@
         $(call DO.EMXEXP,$(filter %.lib,$^),$@)
         sed  -e "/\"___pfn/d" -e "/\"__sys_/d" -e "/\"___sys_/d" -e "/\"___libc_[a-z]/d" -e "/\"__nsyy/d" $@ > $@.tmp
         mv -f $@.tmp $@
-        krx.exe src/lib/dlllegacy.cmd -e "_DLL_InitTerm" $@ src/lib/libc.def
+        src/lib/dlllegacy.cmd -e "_DLL_InitTerm" $@ src/lib/libc.def
         mv -f $@ $@.tmp
         cat "src/lib/libstdc++.def" >> $@.tmp
         mv -f $@.tmp $@

Makefile.gmk

@@ -124 +124 @@
 LDFLAGS.prf = -g -Zcrtdll=c_dll -lkProfile -LG:/kTaskMgr/Tree/lib/debug
 LDFLAGS.dbg = -g
 LDFLAGS.aout = -Zaout
-ifeq ($(EMXOMFLD_TYPE),wlink)
+ifneq ($(filter wlink WLINK,$(EMXOMFLD_TYPE)),)
 LDFLAGS.omf = -Zomf
 else
 LDFLAGS.omf = -Zomf -Zlinker /PM:VIO -Zlinker /LINENUMBERS