Changeset 1355 in kBuild

Timestamp:

Dec 3, 2007 1:09:07 AM (17 years ago)

Author:

bird

Message:

Don't check for append-dash-n, it's there.

Location:

trunk/kBuild/tools

Files:

• GXX32.kmk (modified) (2 diffs)
• GXX64.kmk (modified) (2 diffs)
• XGCCAMD64LINUX.kmk (modified) (2 diffs)

trunk/kBuild/tools/GXX32.kmk

@@ -210 +210 @@
 TOOL_GXX32_LINK_LIBRARY_DEPEND = $(othersrc)
 TOOL_GXX32_LINK_LIBRARY_DEPORD =
-ifeq ($(filter append-dash-n,$(KMK_FEATURES)),append-dash-n)
 define TOOL_GXX32_LINK_LIBRARY_CMDS
         $(QUIET)$(APPEND) $(out).ar-script 'CREATE $(out)'
@@ -220 +219 @@
         $(QUIET)$(REDIRECT) -rti $(out).ar-script -- $(TOOL_GXX32_AR) -M
 endef
-else
-define TOOL_GXX32_LINK_LIBRARY_CMDS
-        $(QUIET)$(APPEND) $(out).ar-script "CREATE $(out)"
-        $(foreach o, $(objs)\
-                ,$(NL)$(TAB)$(QUIET)$(APPEND) $(out).ar-script "ADDMOD $(o)")
-        $(foreach srclib,$(othersrc)\
-                ,$(NL)$(TAB)$(QUIET)$(APPEND) $(out).ar-script "ADDLIB $(srclib)")
-        $(QUIET)$(APPEND) $(out).ar-script "SAVE"
-        $(QUIET)$(APPEND) $(out).ar-script "END"
-        $(QUIET)$(REDIRECT) -rti $(out).ar-script -- $(TOOL_GXX32_AR) -M
-endef
-endif
 
 

trunk/kBuild/tools/GXX64.kmk

@@ -210 +210 @@
 TOOL_GXX64_LINK_LIBRARY_DEPEND = $(othersrc)
 TOOL_GXX64_LINK_LIBRARY_DEPORD =
-ifeq ($(filter append-dash-n,$(KMK_FEATURES)),append-dash-n)
 define TOOL_GXX64_LINK_LIBRARY_CMDS
         $(QUIET)$(APPEND) $(out).ar-script 'CREATE $(out)'
@@ -220 +219 @@
         $(QUIET)$(REDIRECT) -rti $(out).ar-script -- $(TOOL_GXX64_AR) -M
 endef
-else
-define TOOL_GXX64_LINK_LIBRARY_CMDS
-        $(QUIET)$(APPEND) $(out).ar-script "CREATE $(out)"
-        $(foreach o, $(objs)\
-                ,$(NL)$(TAB)$(QUIET)$(APPEND) $(out).ar-script "ADDMOD $(o)")
-        $(foreach srclib,$(othersrc)\
-                ,$(NL)$(TAB)$(QUIET)$(APPEND) $(out).ar-script "ADDLIB $(srclib)")
-        $(QUIET)$(APPEND) $(out).ar-script "SAVE"
-        $(QUIET)$(APPEND) $(out).ar-script "END"
-        $(QUIET)$(REDIRECT) -rti $(out).ar-script -- $(TOOL_GXX64_AR) -M
-endef
-endif
 
 

trunk/kBuild/tools/XGCCAMD64LINUX.kmk

@@ -194 +194 @@
 TOOL_XGCCAMD64LINUX_LINK_LIBRARY_DEPEND = $(othersrc)
 TOOL_XGCCAMD64LINUX_LINK_LIBRARY_DEPORD =
-ifeq ($(filter append-dash-n,$(KMK_FEATURES)),append-dash-n)
 define TOOL_XGCCAMD64LINUX_LINK_LIBRARY_CMDS
         $(QUIET)$(APPEND) $(out).ar-script 'CREATE $(out)'
@@ -204 +203 @@
         $(QUIET)$(REDIRECT) -rti $(out).ar-script -- $(TOOL_XGCCAMD64LINUX_AR) -M
 endef
-else
-define TOOL_XGCCAMD64LINUX_LINK_LIBRARY_CMDS
-        $(QUIET)$(APPEND) $(out).ar-script "CREATE $(out)"
-        $(foreach o, $(objs)\
-                ,$(NL)$(TAB)$(QUIET)$(APPEND) $(out).ar-script "ADDMOD $(o)")
-        $(foreach srclib, $(othersrc)\
-                ,$(NL)$(TAB)$(QUIET)$(APPEND) $(out).ar-script "ADDLIB $(srclib)")
-        $(QUIET)$(APPEND) $(out).ar-script "SAVE"
-        $(QUIET)$(APPEND) $(out).ar-script "END"
-        $(QUIET)$(REDIRECT) -rti $(out).ar-script -- $(TOOL_XGCCAMD64LINUX_AR) -M
-endef
-endif