Changeset 1034 for trunk/kBuild/tools/GXX3.kmk

Timestamp:

Jun 4, 2007, 4:05:30 AM (18 years ago)

Author:

bird

Message:

MAYBE output. removed some obsolete stuff.

File:

• trunk/kBuild/tools/GXX3.kmk (modified) (5 diffs)

trunk/kBuild/tools/GXX3.kmk

@@ -207 +207 @@
 # @param    $(othersrc) Unhandled sources.
 # @param    $(outbase)  Output basename (full). Use this for list files and such.
-TOOL_GXX3_LINK_LIBRARY_OUTPUT = $(out).ar-script $(outbase).imp.a
+TOOL_GXX3_LINK_LIBRARY_OUTPUT = $(out).ar-script
+TOOL_GXX3_LINK_LIBRARY_OUTPUT_MAYBE = $(outbase).imp.a
 TOOL_GXX3_LINK_LIBRARY_DEPEND = $(othersrc)
 TOOL_GXX3_LINK_LIBRARY_DEPORD =
-ifeq ($(filter append-dash-n,$(KMK_FEATURES)),append-dash-n)
 define TOOL_GXX3_LINK_LIBRARY_CMDS
         $(QUIET)$(APPEND) $(out).ar-script 'CREATE $(out)'
@@ -223 +223 @@
         $(QUIET)$(TOOL_GXX3_AR) -M < $(out).ar-script
 endef
-else
-define TOOL_GXX3_LINK_LIBRARY_CMDS
-        $(QUIET)$(APPEND) $(out).ar-script "CREATE $(out)"
-        $(foreach o, $(objs)\
-                ,$(NL)$(TAB)$(QUIET)$(APPEND) $(out).ar-script "ADDMOD $(o)")
-        $(foreach srclib, $(filter-out %.def %.imp,$(othersrc))\
-                ,$(NL)$(TAB)$(QUIET)$(APPEND) $(out).ar-script "ADDLIB $(srclib)")
-        $(if $(filter %.def %.imp,$(othersrc))\
-                ,$(TOOL_GXX3_AR_IMP) -o $(outbase).imp.a $(filter %.def %.imp,$(othersrc))\
-                 $(NL)$(TAB)$(QUIET)$(APPEND) $(out).ar-script "ADDLIB $(outbase).imp.a")
-        $(QUIET)$(APPEND) $(out).ar-script "SAVE"
-        $(QUIET)$(APPEND) $(out).ar-script "END"
-        $(QUIET)$(TOOL_GXX3_AR) -M < $(out).ar-script
-endef
-endif
 
 
@@ -253 +238 @@
 # @param    $(custom_post)  Custom step invoked after linking.
 # @param    $(outbase)  Output basename (full). Use this for list files and such.
-TOOL_GXX3_LINK_PROGRAM_OUTPUT = $(outbase).map
+TOOL_GXX3_LINK_PROGRAM_OUTPUT =
+TOOL_GXX3_LINK_PROGRAM_OUTPUT_MAYBE = $(outbase).map
 TOOL_GXX3_LINK_PROGRAM_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib)))\
                 $(filter %.def, $(othersrc))
@@ -279 +265 @@
 # @param    $(custom_post)  Custom step invoked after linking.
 # @param    $(outbase)  Output basename (full). Use this for list files and such.
-TOOL_GXX3_LINK_DLL_OUTPUT = $(outbase).map
+TOOL_GXX3_LINK_DLL_OUTPUT =
+TOOL_GXX3_LINK_DLL_OUTPUT_MAYBE = $(outbase).map
 TOOL_GXX3_LINK_DLL_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib)))\
                 $(filter %.def, $(othersrc))
@@ -307 +294 @@
 # @param    $(custom_post)  Custom step invoked after linking.
 # @param    $(outbase)  Output basename (full). Use this for list files and such.
-TOOL_GXX3_LINK_SYSMOD_OUTPUT = $(outbase).map
+TOOL_GXX3_LINK_SYSMOD_OUTPUT =
+TOOL_GXX3_LINK_SYSMOD_OUTPUT_MAYBE = $(outbase).map
 TOOL_GXX3_LINK_SYSMOD_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib)))\
                 $(filter %.def, $(othersrc))