corba/make/common/shared/Compiler-msvc.gmk
changeset 3871 3d528461f61d
parent 2200 69f669804c0a
child 5385 8308e15f228e
equal deleted inserted replaced
3665:c5d39b6be65c 3871:3d528461f61d
    46   
    46   
    47   # unset any GNU Make settings of MFLAGS and MAKEFLAGS which may mess up nmake
    47   # unset any GNU Make settings of MFLAGS and MAKEFLAGS which may mess up nmake
    48   NMAKE          = MFLAGS= MAKEFLAGS= $(COMPILER_PATH)nmake -nologo
    48   NMAKE          = MFLAGS= MAKEFLAGS= $(COMPILER_PATH)nmake -nologo
    49 
    49 
    50   # Compiler version and type (Always get word after "Version")
    50   # Compiler version and type (Always get word after "Version")
    51   CC_VER  := $(shell $(CC) 2>&1 | $(HEAD) -n 1 | $(SED) 's/.*\(Version.*\)/\1/' | $(NAWK) '{print $$2}')
    51   ifndef CC_VER
    52   
    52     CC_VER  := $(shell $(CC) 2>&1 | $(HEAD) -n 1 | $(SED) 's/.*\(Version.*\)/\1/' | $(NAWK) '{print $$2}')
       
    53     export CC_VER
       
    54   endif
       
    55 
    53   # SDK-64 and MSVC6 put REBASE.EXE in a different places - go figure...
    56   # SDK-64 and MSVC6 put REBASE.EXE in a different places - go figure...
    54   ifeq ($(ARCH_DATA_MODEL), 32)
    57   ifeq ($(ARCH_DATA_MODEL), 32)
    55     LINK_VER := $(shell $(LINK) | $(HEAD) -n 1 | $(NAWK) '{print $$6}')
    58     ifndef LINK_VER
       
    59       LINK_VER := $(shell $(LINK) | $(HEAD) -n 1 | $(NAWK) '{print $$6}')
       
    60       export LINK_VER
       
    61     endif
    56     CC_MAJORVER :=$(call MajorVersion,$(CC_VER))
    62     CC_MAJORVER :=$(call MajorVersion,$(CC_VER))
    57     ifeq ($(CC_MAJORVER), 13)
    63     ifeq ($(CC_MAJORVER), 13)
    58       # This should be: CC_VER=13.10.3077 LINK_VER=7.10.3077
    64       # This should be: CC_VER=13.10.3077 LINK_VER=7.10.3077
    59       REQUIRED_CC_VER = 13.10.3077
    65       REQUIRED_CC_VER = 13.10.3077
    60       REQUIRED_LINK_VER = 7.10.3077
    66       REQUIRED_LINK_VER = 7.10.3077
    91 	COMPILER_PATH := $(error COMPILER_PATH cannot be empty here)
    97 	COMPILER_PATH := $(error COMPILER_PATH cannot be empty here)
    92       endif
    98       endif
    93     endif
    99     endif
    94   else
   100   else
    95     # else ARCH_DATA_MODEL is 64
   101     # else ARCH_DATA_MODEL is 64
    96     LINK_VER := $(shell $(LINK) | $(HEAD) -n 1 | $(NAWK) '{print $$6}')
   102     ifndef LINK_VER
       
   103       LINK_VER := $(shell $(LINK) | $(HEAD) -n 1 | $(NAWK) '{print $$6}')
       
   104       export LINK_VER
       
   105     endif
    97     CC_MAJORVER :=$(call MajorVersion,$(CC_VER))
   106     CC_MAJORVER :=$(call MajorVersion,$(CC_VER))
    98     CC_MINORVER :=$(call MinorVersion,$(CC_VER))
   107     CC_MINORVER :=$(call MinorVersion,$(CC_VER))
    99     CC_MICROVER :=$(call MicroVersion,$(CC_VER))
   108     CC_MICROVER :=$(call MicroVersion,$(CC_VER))
   100     ifeq ($(ARCH), ia64)
   109     ifeq ($(ARCH), ia64)
   101       REQUIRED_CC_VER = 13.00.9337.7
   110       REQUIRED_CC_VER = 13.00.9337.7