make/common/Library.gmk

*** 1,7 ****
  #
! # Copyright (c) 1995, 2011, Oracle and/or its affiliates. All rights reserved.
  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  #
  # This code is free software; you can redistribute it and/or modify it
  # under the terms of the GNU General Public License version 2 only, as
  # published by the Free Software Foundation.  Oracle designates this
--- 1,7 ----
  #
! # Copyright (c) 1995, 2012, Oracle and/or its affiliates. All rights reserved.
  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  #
  # This code is free software; you can redistribute it and/or modify it
  # under the terms of the GNU General Public License version 2 only, as
  # published by the Free Software Foundation.  Oracle designates this
*** 165,185 ****
                  @$(OBJDIR)/$(LIBRARY).lcf $(OTHER_LCF) $(LDLIBS_COMMON)
  else # LIBRARY
  # build it into $(OBJDIR) so that the other generated files get put 
  # there, then copy just the DLL (and MAP file) to the requested directory.
  #
  $(ACTUAL_LIBRARY):: $(OBJDIR)/$(LIBRARY).lcf
          @$(prep-target)
          @$(MKDIR) -p $(OBJDIR)
          $(LINK) -dll -out:$(OBJDIR)/$(@F) \
!           -map:$(OBJDIR)/$(LIBRARY).map \
            $(LFLAGS) @$(OBJDIR)/$(LIBRARY).lcf \
            $(OTHER_LCF) $(LDLIBS)
          $(CP) $(OBJDIR)/$(@F) $@
          @$(call binary_file_verification,$@)
          $(CP) $(OBJDIR)/$(LIBRARY).map $(@D)
          $(CP) $(OBJDIR)/$(LIBRARY).pdb $(@D)
  
  endif # LIBRARY
  
  $(OBJDIR)/$(LIBRARY).lcf: $(OBJDIR)/$(LIBRARY).res $(COMPILE_FILES_o) $(FILES_m)
          @$(prep-target)
--- 165,191 ----
                  @$(OBJDIR)/$(LIBRARY).lcf $(OTHER_LCF) $(LDLIBS_COMMON)
  else # LIBRARY
  # build it into $(OBJDIR) so that the other generated files get put 
  # there, then copy just the DLL (and MAP file) to the requested directory.
  #
+ ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+   MAP_OPTION="-map:$(OBJDIR)/$(LIBRARY).map"
+ endif
+ 
  $(ACTUAL_LIBRARY):: $(OBJDIR)/$(LIBRARY).lcf
          @$(prep-target)
          @$(MKDIR) -p $(OBJDIR)
          $(LINK) -dll -out:$(OBJDIR)/$(@F) \
!           $(MAP_OPTION) \
            $(LFLAGS) @$(OBJDIR)/$(LIBRARY).lcf \
            $(OTHER_LCF) $(LDLIBS)
          $(CP) $(OBJDIR)/$(@F) $@
          @$(call binary_file_verification,$@)
+ ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
          $(CP) $(OBJDIR)/$(LIBRARY).map $(@D)
          $(CP) $(OBJDIR)/$(LIBRARY).pdb $(@D)
+ endif
  
  endif # LIBRARY
  
  $(OBJDIR)/$(LIBRARY).lcf: $(OBJDIR)/$(LIBRARY).res $(COMPILE_FILES_o) $(FILES_m)
          @$(prep-target)