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

Collapse All | Expand All

(-)Mk/bsd.port.mk (-3 / +2 lines)
Lines 1441-1449 DESTDIRNAME?= DESTDIR Link Here
1441
# Loading features
1448
# Loading features
1442
.for f in ${USES}
1449
.for f in ${USES}
1443
_f:=		${f:C/\:.*//}
1450
_f:=		${f:C/\:.*//}
1444
.if !defined(${_f}_ARGS)
1451
${_f}_ARGS+=	${f:C/^[^\:]*(\:|\$)//:S/,/ /g}
1445
${_f}_ARGS:=	${f:C/^[^\:]*(\:|\$)//:S/,/ /g}
1452
${_f}_ARGS:=	${${_f}_ARGS:O:u}
1446
.endif
1447
.endfor
1453
.endfor
1448
.for f in ${USES}
1454
.for f in ${USES}
1449
.include "${USESDIR}/${f:C/\:.*//}.mk"
1455
.include "${USESDIR}/${f:C/\:.*//}.mk"
(-)Mk/Uses/compiler.mk (-11 / +26 lines)
Lines 36-61 compiler_ARGS= env Link Here
36
36
37
VALID_ARGS=	c++11-lib c++11-lang c11 features openmp env nestedfct c++0x gcc-c++11-lib
37
VALID_ARGS=	c++11-lib c++11-lang c11 features openmp env nestedfct c++0x gcc-c++11-lib
38
38
39
.if ${compiler_ARGS} == gcc-c++11-lib
39
.if ${compiler_ARGS:Mgcc-c++11-lib}
40
_COMPILER_ARGS+=	features gcc-c++11-lib
40
_COMPILER_ARGS+=	features gcc-c++11-lib
41
.elif ${compiler_ARGS} == c++11-lib
41
.endif
42
.if ${compiler_ARGS:Mc++11-lib}
42
_COMPILER_ARGS+=	features c++11-lib
43
_COMPILER_ARGS+=	features c++11-lib
43
.elif ${compiler_ARGS} == c++0x
44
.endif
45
.if ${compiler_ARGS:Mc++0x}
44
_COMPILER_ARGS+=	features c++0x
46
_COMPILER_ARGS+=	features c++0x
45
.elif ${compiler_ARGS} == c++11-lang
47
.endif
48
.if ${compiler_ARGS:Mc++11-lang}
46
_COMPILER_ARGS+=	features c++11-lang
49
_COMPILER_ARGS+=	features c++11-lang
47
.elif ${compiler_ARGS} == c11
50
.endif
51
.if ${compiler_ARGS:Mc11}
48
_COMPILER_ARGS+=	features c11
52
_COMPILER_ARGS+=	features c11
49
.elif ${compiler_ARGS} == features
53
.endif
54
.if ${compiler_ARGS:Mfeatures}
50
_COMPILER_ARGS+=	features
55
_COMPILER_ARGS+=	features
51
.elif ${compiler_ARGS} == env
56
.endif
57
.if ${compiler_ARGS:Menv}
52
_COMPILER_ARGS+=	env
58
_COMPILER_ARGS+=	env
53
.elif ${compiler_ARGS} == openmp
59
.endif
60
.if ${compiler_ARGS:Mopenmp}
54
_COMPILER_ARGS+=	env openmp
61
_COMPILER_ARGS+=	env openmp
55
.elif ${compiler_ARGS} == nestedfct
62
.endif
63
.if ${compiler_ARGS:Mnestedfct}
56
_COMPILER_ARGS+=	env nestedfct
64
_COMPILER_ARGS+=	env nestedfct
57
.else
65
.endif
58
IGNORE=	Invalid argument "${compiler_ARGS}", valid arguments are: ${VALID_ARGS}
66
67
INVALID_ARGS=	${compiler_ARGS}
68
.for v in ${VALID_ARGS}
69
INVALID_ARGS:=	${INVALID_ARGS:N${v}}
70
.endfor
71
72
.if !empty(INVALID_ARGS)
73
IGNORE=	Invalid argument "${INVALID_ARGS}", valid arguments are: ${VALID_ARGS}
59
_COMPILER_ARGS=	#
74
_COMPILER_ARGS=	#
60
.endif
75
.endif
61
76

Return to bug 199603