View | Details | Raw Unified | Return to bug 244781 | Differences between
and this patch

Collapse All | Expand All

(-)Mk/Uses/compiler.mk (-2 / +2 lines)
Lines 79-85 _CCVERSION!= ${CC} --version Link Here
79 
_CCVERSION_${_CC_hash}=	${_CCVERSION}
 79 
_CCVERSION_${_CC_hash}=	${_CCVERSION}
80 
PORTS_ENV_VARS+=	_CCVERSION_${_CC_hash}
 80 
PORTS_ENV_VARS+=	_CCVERSION_${_CC_hash}
81 
.endif
 81 
.endif
82 
COMPILER_VERSION=	${_CCVERSION:M[0-9].[0-9]*:tW:C/([0-9]).([0-9]).*/\1\2/g}
 82 
COMPILER_VERSION=	${_CCVERSION:M[0-9]*.[0-9]*:[1]:C/([0-9]+)\.([0-9]+)\..*/\1\2/}
83 
.if ${_CCVERSION:Mclang}
 83 
.if ${_CCVERSION:Mclang}
84 
COMPILER_TYPE=	clang
 84 
COMPILER_TYPE=	clang
85 
.else
 85 
.else
Lines 103-109 _ALTCCVERSION_${_CC_hash}= ${_ALTCCVERSION} Link Here
103 
PORTS_ENV_VARS+=		_ALTCCVERSION_${_CC_hash}
 103 
PORTS_ENV_VARS+=		_ALTCCVERSION_${_CC_hash}
104 
.endif
 104 
.endif
105 

          105
          

        

          
            

              106
              
ALT_COMPILER_VERSION=	${_ALTCCVERSION:M[0-9].[0-9]*:tW:C/([0-9]).([0-9]).*/\1\2/g}


              106
              
ALT_COMPILER_VERSION=	${_ALTCCVERSION:M[0-9]*.[0-9]*:[1]:C/([0-9]+)\.([0-9]+)\..*/\1\2/}

            

        

          107
          
.if ${_ALTCCVERSION:Mclang}

          107
          
.if ${_ALTCCVERSION:Mclang}

        

        

          108
          
ALT_COMPILER_TYPE=	clang

          108
          
ALT_COMPILER_TYPE=	clang

        

        

          109
          
.elif ${_ALTCCVERSION} != none

          109
          
.elif ${_ALTCCVERSION} != none

        



(-)Mk/Uses/objc.mk
      (-2 / +2 lines)




  

    
      
            Lines 26-32
          _CCVERSION!=	${CC} --version
      
      
        Link Here
      
    
  

        

          26
          
_OBJC_CCVERSION_${_CC_hash}=	${_CCVERSION}

          26
          
_OBJC_CCVERSION_${_CC_hash}=	${_CCVERSION}

        

        

          27
          
PORTS_ENV_VARS+=	_OBJC_CCVERSION_${_CC_hash}

          27
          
PORTS_ENV_VARS+=	_OBJC_CCVERSION_${_CC_hash}

        

        

          28
          
.endif

          28
          
.endif

        

          
            

              29
              
COMPILER_VERSION=	${_CCVERSION:M[0-9].[0-9]*:tW:C/([0-9]).([0-9]).*/\1\2/g}


              29
              
COMPILER_VERSION=	${_CCVERSION:M[0-9]*.[0-9]*:[1]:C/([0-9]+)\.([0-9]+)\..*/\1\2/}

            

        

          30
          
.if ${_CCVERSION:Mclang}

          30
          
.if ${_CCVERSION:Mclang}

        

        

          31
          
COMPILER_TYPE=	clang

          31
          
COMPILER_TYPE=	clang

        

        

          32
          
.else

          32
          
.else

        

  

    
      
            Lines 48-54
          _OBJC_ALTCCVERSION_${_CC_hash}=	${_ALTCCVERSION}
      
      
        Link Here
      
    
  

        

          48
          
PORTS_ENV_VARS+=		_OBJC_ALTCCVERSION_${_CC_hash}

          48
          
PORTS_ENV_VARS+=		_OBJC_ALTCCVERSION_${_CC_hash}

        

        

          49
          
.endif

          49
          
.endif

        

        

          50
          

          50
          

        

          
            

              51
              
ALT_COMPILER_VERSION=	${_ALTCCVERSION:M[0-9].[0-9]*:tW:C/([0-9]).([0-9]).*/\1\2/g}


              51
              
ALT_COMPILER_VERSION=	${_ALTCCVERSION:M[0-9]*.[0-9]*:[1]:C/([0-9]+)\.([0-9]+)\..*/\1\2/}

            

        

          52
          
.if ${_ALTCCVERSION:Mclang}

          52
          
.if ${_ALTCCVERSION:Mclang}

        

        

          53
          
ALT_COMPILER_TYPE=	clang

          53
          
ALT_COMPILER_TYPE=	clang

        

        

          54
          
.elif !empty(_ALTCCVERSION)

          54
          
.elif !empty(_ALTCCVERSION)

        






  

  Return to bug 244781