Changeset 3898

Timestamp:

Jun 29, 2014, 9:44:25 PM (11 years ago)

Author:

bird

Message:

More alias fixes.

Location:

trunk/libc

Files:

• Makefile.kmk (modified) (1 diff)
• alias.kmk (modified) (2 diffs)

trunk/libc/Makefile.kmk

@@ -543 +543 @@
         $(MAKE) -f alias.kmk libraries
 
+aliases: $(KLIBC_LIB_ALIAS)
+

trunk/libc/alias.kmk

@@ -40 +40 @@
 # The installation is done manually by Makefile.kmk. Yea, it's a hack of sorts...
 #
+if defined(CFG_LIBC_USE_WATCOM)
+libc_alias_TOOL = OPENWATCOM
+else
 libc_alias_TOOL = GCC3
+endif
 libc_alias_NOINST = 1
 libc_alias_SOURCES :=
@@ -63 +67 @@
 $(foreach pair,$(ALIASPAIRS),$(eval libc_alias_SOURCES += $$(PATH_TARGET)/libc_alias/$(word 1, $(subst =, ,$(pair))).o))
 
-$(libc_alias_SOURCES): $(LIBC_GENALIAS) alias.kmk | $(call DIRDEP,$(PATH_TARGET)/libc_alias)
-        $(RM) -f $(PATH_TARGET)/aliases.rsp $(libc_alias_SOURCES)
-        $(foreach pair,$(ALIASPAIRS) \
-                ,$(NL)$(TAB)$(APPEND) $(PATH_TARGET)/libc_alias/aliases.rsp "$(pair)")
+$(addsuffix $(SP)+$(SP),$(libc_alias_SOURCES)): $(LIBC_GENALIAS) alias.kmk | $(call DIRDEP,$(PATH_TARGET)/libc_alias)
+        @$(RM) -f $(PATH_TARGET)/aliases.rsp $(libc_alias_SOURCES)
+        @$(APPEND) -tn $(PATH_TARGET)/libc_alias/aliases.rsp $(foreach pair,$(ALIASPAIRS),"$(pair)")
         $(LIBC_GENALIAS) -f $(LIBC_GENALIAS_FORMAT) -D $(PATH_TARGET)/libc_alias -r $(PATH_TARGET)/libc_alias/aliases.rsp