diff options
| author | antoine <antoine@FreeBSD.org> | 2016-01-15 02:54:29 +0800 |
|---|---|---|
| committer | antoine <antoine@FreeBSD.org> | 2016-01-15 02:54:29 +0800 |
| commit | f8dff04af4211c68435f230f1a60afcdcee2b5fc (patch) | |
| tree | 62323c4e8570df433c963e5dfaf3a64ea3f1e874 /Mk | |
| parent | 99cbf90585f1ee6087054d0dda732d3961493f99 (diff) | |
| download | freebsd-ports-gnome-f8dff04af4211c68435f230f1a60afcdcee2b5fc.tar.gz freebsd-ports-gnome-f8dff04af4211c68435f230f1a60afcdcee2b5fc.tar.zst freebsd-ports-gnome-f8dff04af4211c68435f230f1a60afcdcee2b5fc.zip | |
Extend r405599 to make COMPILER_VERSION and ALT_COMPILER_VERSION more
compatible with clang 3.8 trunk
PR: 206074
With hat: portmgr
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/Uses/compiler.mk | 6 | ||||
| -rw-r--r-- | Mk/Uses/objc.mk | 12 |
2 files changed, 15 insertions, 3 deletions
diff --git a/Mk/Uses/compiler.mk b/Mk/Uses/compiler.mk index c0949e1ce36e..7f14e43117e2 100644 --- a/Mk/Uses/compiler.mk +++ b/Mk/Uses/compiler.mk @@ -89,7 +89,11 @@ _ALTCCVERSION!= /usr/bin/clang --version _ALTCCVERSION!= /usr/bin/gcc --version .endif -ALT_COMPILER_VERSION= ${_ALTCCVERSION:M[0-9].[0-9]*:C/([0-9]).([0-9]).*/\1\2/g} +.if defined(.PARSEDIR) +ALT_COMPILER_VERSION= ${_ALTCCVERSION:M[0-9].[0-9]*:tW:C/([0-9]).([0-9]).*/\1\2/g} +.else +ALT_COMPILER_VERSION= ${_ALTCCVERSION:M[0-9].[0-9]*:C/([0-9]).([0-9]).*/\1\2/g:u} +.endif .if ${_ALTCCVERSION:Mclang} ALT_COMPILER_TYPE= clang .elif !empty(_ALTCCVERSION) diff --git a/Mk/Uses/objc.mk b/Mk/Uses/objc.mk index 631fa851d2e8..90f7f7e26527 100644 --- a/Mk/Uses/objc.mk +++ b/Mk/Uses/objc.mk @@ -16,7 +16,11 @@ IGNORE= USES=objc only accepts no arguments or 'compiler' .endif _CCVERSION!= ${CC} --version -COMPILER_VERSION= ${_CCVERSION:M[0-9].[0-9]*:C/([0-9]).([0-9]).*/\1\2/g} +.if defined(.PARSEDIR) +COMPILER_VERSION= ${_CCVERSION:M[0-9].[0-9]*:tW:C/([0-9]).([0-9]).*/\1\2/g} +.else +COMPILER_VERSION= ${_CCVERSION:M[0-9].[0-9]*:C/([0-9]).([0-9]).*/\1\2/g:u} +.endif .if ${_CCVERSION:Mclang} COMPILER_TYPE= clang .else @@ -32,7 +36,11 @@ _ALTCCVERSION!= /usr/bin/clang --version _ALTCCVERSION!= /usr/bin/gcc --version .endif -ALT_COMPILER_VERSION= ${_ALTCCVERSION:M[0-9].[0-9]*:C/([0-9]).([0-9]).*/\1\2/g} +.if defined(.PARSEDIR) +ALT_COMPILER_VERSION= ${_ALTCCVERSION:M[0-9].[0-9]*:tW:C/([0-9]).([0-9]).*/\1\2/g} +.else +ALT_COMPILER_VERSION= ${_ALTCCVERSION:M[0-9].[0-9]*:C/([0-9]).([0-9]).*/\1\2/g:u} +.endif .if ${_ALTCCVERSION:Mclang} ALT_COMPILER_TYPE= clang .elif !empty(_ALTCCVERSION) |