VirtualBox

Changeset 1612 in kBuild


Ignore:
Timestamp:
May 12, 2008 3:42:09 PM (17 years ago)
Author:
bird
Message:

Drop the .map files when using gcc, except of course, for OS/2.

Location:
trunk/kBuild/tools
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/kBuild/tools/GCC3.kmk

    r1547 r1612  
    2525#
    2626# As a special exception you are granted permission to include this file, via
    27 # the kmk include directive, as you wish without this in itself causing the 
    28 # resulting makefile, program or whatever to be covered by the GPL license. 
     27# the kmk include directive, as you wish without this in itself causing the
     28# resulting makefile, program or whatever to be covered by the GPL license.
    2929# This exception does not however invalidate any other reasons why the makefile,
    3030# program, whatever should not be covered the GPL.
    … …  
    6060 TOOL_GCC3_LD_MAP ?= -Zmap=$(1)
    6161 TOOL_GCC3_LD_SYSMOD_MAP ?= -Zmap=$(1)
     62else
     63 TOOL_GCC3_LD_MAP ?=
     64 TOOL_GCC3_LD_SYSMOD_MAP ?=
    6265endif
    6366ifdef SLKRUNS

  • trunk/kBuild/tools/GCC32.kmk

    r1547 r1612  
    2525#
    2626# As a special exception you are granted permission to include this file, via
    27 # the kmk include directive, as you wish without this in itself causing the 
    28 # resulting makefile, program or whatever to be covered by the GPL license. 
     27# the kmk include directive, as you wish without this in itself causing the
     28# resulting makefile, program or whatever to be covered by the GPL license.
    2929# This exception does not however invalidate any other reasons why the makefile,
    3030# program, whatever should not be covered the GPL.
    … …  
    5252TOOL_GCC32_LD_MAP ?= -Zmap=$(1)
    5353else
    54 TOOL_GCC32_LD_MAP ?= -Wl,-Map -Wl,$(1) -Wl,--cref
     54TOOL_GCC32_LD_MAP ?=
    5555endif
    5656ifeq ($(KBUILD_TARGET),os2)
    5757TOOL_GCC32_LD_SYSMOD_MAP ?= -Zmap=$(1)
    5858else
    59 TOOL_GCC32_LD_SYSMOD_MAP ?= -Map $(1) --cref
     59TOOL_GCC32_LD_SYSMOD_MAP ?=
    6060endif
    6161ifdef SLKRUNS

  • trunk/kBuild/tools/GCC3PLAIN.kmk

    r1547 r1612  
    2525#
    2626# As a special exception you are granted permission to include this file, via
    27 # the kmk include directive, as you wish without this in itself causing the 
    28 # resulting makefile, program or whatever to be covered by the GPL license. 
     27# the kmk include directive, as you wish without this in itself causing the
     28# resulting makefile, program or whatever to be covered by the GPL license.
    2929# This exception does not however invalidate any other reasons why the makefile,
    3030# program, whatever should not be covered the GPL.
    … …  
    311311                $(filter %.def, $(othersrc))\
    312312                $(foreach p,$(libpath), -L$(p))\
    313                 $(foreach lib,$(libs), $(if $(findstring $(lib),$(subst /,x,$(lib))), -l$(patsubst lib%,%,$(lib)), $(lib)))\
    314                 $(call TOOL_GCC3PLAIN_LD_SYSMOD_MAP.$(bld_trg),$(outbase).map)
    315 endef
    316 
     313                $(foreach lib,$(libs), $(if $(findstring $(lib),$(subst /,x,$(lib))), -l$(patsubst lib%,%,$(lib)), $(lib)))
     314endef
     315

  • trunk/kBuild/tools/GCC64.kmk

    r1547 r1612  
    2525#
    2626# As a special exception you are granted permission to include this file, via
    27 # the kmk include directive, as you wish without this in itself causing the 
    28 # resulting makefile, program or whatever to be covered by the GPL license. 
     27# the kmk include directive, as you wish without this in itself causing the
     28# resulting makefile, program or whatever to be covered by the GPL license.
    2929# This exception does not however invalidate any other reasons why the makefile,
    3030# program, whatever should not be covered the GPL.
    … …  
    5252TOOL_GCC64_LD_MAP ?= -Zmap=$(1)
    5353else
    54 TOOL_GCC64_LD_MAP ?= -Wl,-Map -Wl,$(1) -Wl,--cref
     54TOOL_GCC64_LD_MAP ?=
    5555endif
    5656ifeq ($(KBUILD_TARGET),os2)
    5757TOOL_GCC64_LD_SYSMOD_MAP ?= -Zmap=$(1)
    5858else
    59 TOOL_GCC64_LD_SYSMOD_MAP ?= -Map $(1) --cref
     59TOOL_GCC64_LD_SYSMOD_MAP ?=
    6060endif
    6161ifdef SLKRUNS

  • trunk/kBuild/tools/GXX3.kmk

    r1547 r1612  
    2626#
    2727# As a special exception you are granted permission to include this file, via
    28 # the kmk include directive, as you wish without this in itself causing the 
    29 # resulting makefile, program or whatever to be covered by the GPL license. 
     28# the kmk include directive, as you wish without this in itself causing the
     29# resulting makefile, program or whatever to be covered by the GPL license.
    3030# This exception does not however invalidate any other reasons why the makefile,
    3131# program, whatever should not be covered the GPL.
    … …  
    6161 TOOL_GXX3_LD_MAP ?= -Zmap=$(1)
    6262 TOOL_GXX3_LD_SYSMOD_MAP ?= -Zmap=$(1)
     63else
     64 TOOL_GXX3_LD_MAP ?=
     65 TOOL_GXX3_LD_SYSMOD_MAP ?=
    6366endif
    6467ifdef SLKRUNS

  • trunk/kBuild/tools/GXX32.kmk

    r1547 r1612  
    2525#
    2626# As a special exception you are granted permission to include this file, via
    27 # the kmk include directive, as you wish without this in itself causing the 
    28 # resulting makefile, program or whatever to be covered by the GPL license. 
     27# the kmk include directive, as you wish without this in itself causing the
     28# resulting makefile, program or whatever to be covered by the GPL license.
    2929# This exception does not however invalidate any other reasons why the makefile,
    3030# program, whatever should not be covered the GPL.
    … …  
    5252TOOL_GXX32_LD_MAP ?= -Zmap=$(1)
    5353else
    54 TOOL_GXX32_LD_MAP ?= -Wl,-Map -Wl,$(1) -Wl,--cref
     54TOOL_GXX32_LD_MAP ?=
    5555endif
    5656ifeq ($(KBUILD_TARGET),os2)
    5757TOOL_GXX32_LD_SYSMOD_MAP ?= -Zmap=$(1)
    5858else
    59 TOOL_GXX32_LD_SYSMOD_MAP ?= -Map $(1) --cref
     59TOOL_GXX32_LD_SYSMOD_MAP ?=
    6060endif
    6161ifdef SLKRUNS

  • trunk/kBuild/tools/GXX3PLAIN.kmk

    r1547 r1612  
    2525#
    2626# As a special exception you are granted permission to include this file, via
    27 # the kmk include directive, as you wish without this in itself causing the 
    28 # resulting makefile, program or whatever to be covered by the GPL license. 
     27# the kmk include directive, as you wish without this in itself causing the
     28# resulting makefile, program or whatever to be covered by the GPL license.
    2929# This exception does not however invalidate any other reasons why the makefile,
    3030# program, whatever should not be covered the GPL.
    … …  
    311311                $(filter %.def, $(othersrc))\
    312312                $(foreach p,$(libpath), -L$(p))\
    313                 $(foreach lib,$(libs), $(if $(findstring $(lib),$(subst /,x,$(lib))), -l$(patsubst lib%,%,$(lib)), $(lib)))\
    314                 $(call TOOL_GXX3PLAIN_LD_SYSMOD_MAP.$(bld_trg),$(outbase).map)
    315 endef
    316 
     313                $(foreach lib,$(libs), $(if $(findstring $(lib),$(subst /,x,$(lib))), -l$(patsubst lib%,%,$(lib)), $(lib)))
     314endef
     315

  • trunk/kBuild/tools/GXX64.kmk

    r1547 r1612  
    2525#
    2626# As a special exception you are granted permission to include this file, via
    27 # the kmk include directive, as you wish without this in itself causing the 
    28 # resulting makefile, program or whatever to be covered by the GPL license. 
     27# the kmk include directive, as you wish without this in itself causing the
     28# resulting makefile, program or whatever to be covered by the GPL license.
    2929# This exception does not however invalidate any other reasons why the makefile,
    3030# program, whatever should not be covered the GPL.
    … …  
    5252TOOL_GXX64_LD_MAP ?= -Zmap=$(1)
    5353else
    54 TOOL_GXX64_LD_MAP ?= -Wl,-Map -Wl,$(1) -Wl,--cref
     54TOOL_GXX64_LD_MAP ?=
    5555endif
    5656ifeq ($(KBUILD_TARGET),os2)
    5757TOOL_GXX64_LD_SYSMOD_MAP ?= -Zmap=$(1)
    5858else
    59 TOOL_GXX64_LD_SYSMOD_MAP ?= -Map $(1) --cref
     59TOOL_GXX64_LD_SYSMOD_MAP ?=
    6060endif
    6161ifdef SLKRUNS

  • trunk/kBuild/tools/MINGW32.kmk

    r1547 r1612  
    2626#
    2727# As a special exception you are granted permission to include this file, via
    28 # the kmk include directive, as you wish without this in itself causing the 
    29 # resulting makefile, program or whatever to be covered by the GPL license. 
     28# the kmk include directive, as you wish without this in itself causing the
     29# resulting makefile, program or whatever to be covered by the GPL license.
    3030# This exception does not however invalidate any other reasons why the makefile,
    3131# program, whatever should not be covered the GPL.
    … …  
    8585TOOL_MINGW32_LD  ?= $(TOOL_MINGW32_PREFIX)gcc$(TOOL_MINGW32_HOSTSUFF_EXE)
    8686endif
    87 TOOL_MINGW32_LD_MAP ?= -Wl,-Map -Wl,$(1) -Wl,--cref
    88 TOOL_MINGW32_LD_SYSMOD_MAP ?= -Map $(1) --cref
    8987TOOL_MINGW32_DLLWRAP ?= $(TOOL_MINGW32_PREFIX)dllwrap$(TOOL_MINGW32_HOSTSUFF_EXE)
    9088TOOL_MINGW32_DLLTOOL ?= $(TOOL_MINGW32_PREFIX)dlltool$(TOOL_MINGW32_HOSTSUFF_EXE)
    … …  
    236234        $(QUIET)$(TOOL_MINGW32_LD) $(flags) -o $(out) $(objs)\
    237235                $(foreach p,$(libpath), -L$(p))\
    238                 $(foreach lib,$(libs), $(if $(findstring $(lib),$(subst /,x,$(lib))), -l$(patsubst lib%,%,$(basename $(lib))), $(lib)))\
    239                 $(call TOOL_MINGW32_LD_MAP,$(outbase).map)
     236                $(foreach lib,$(libs), $(if $(findstring $(lib),$(subst /,x,$(lib))), -l$(patsubst lib%,%,$(basename $(lib))), $(lib)))
    240237endef
    241238
    … …  
    256253TOOL_MINGW32_LINK_DLL_OUTPUT =
    257254TOOL_MINGW32_LINK_DLL_OUTPUT_MAYBE = $(outbase).a $(outbase).exp $(PATH_LIB)/$(notdir $(outbase)).exp $(PATH_LIB)/$(notdir $(outbase)).a
    258 ## @todo Find a better solution for installing the extra files (.a, .exp, .pdb, .map, etc).
     255## @todo Find a better solution for installing the extra files (.a, .exp, .pdb, etc).
    259256TOOL_MINGW32_LINK_DLL_DEPEND = $(foreach lib,$(libs),$(if $(findstring $(lib),$(subst /,x,$(lib))),, $(lib)))\
    260257        $(filter %.def %.res,$(othersrc))
    … …  
    269266                $(objs)\
    270267                $(foreach p,$(libpath), -L$(p))\
    271                 $(foreach lib,$(libs), $(if $(findstring $(lib),$(subst /,x,$(lib))), -l$(patsubst lib%,%,$(basename $(lib))), $(lib)))\
    272                 $(call TOOL_MINGW32_LD_MAP,$(outbase).map)
     268                $(foreach lib,$(libs), $(if $(findstring $(lib),$(subst /,x,$(lib))), -l$(patsubst lib%,%,$(basename $(lib))), $(lib)))
    273269        $(QUIET)$(CP) $(outbase).exp $(outbase).a $(PATH_LIB)/
    274270endef
    275 ## @todo seperate install stuff!
     271## @todo separate install stuff!
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette