d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use make's :tl instead of checking "no" and "NO"

Browse Source 
Suggested by:	kevans
Reviewed by:	kevans
This commit is contained in:
Ed Maste 2019-02-15 22:48:50 +00:00
parent 8094f70b77
commit 447b492eb8
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
share/mk/bsd.prog.mk
View File

@ -38,8 +38,7 @@ MK_DEBUG_FILES= no
.if ${MK_BIND_NOW} != "no" .if ${MK_BIND_NOW} != "no"
LDFLAGS+= -Wl,-znow LDFLAGS+= -Wl,-znow
.endif .endif
.if ${MK_PIE} != "no" && \ .if ${MK_PIE} != "no" && (!defined(NO_SHARED) || ${NO_SHARED:tl} == "no")
(!defined(NO_SHARED) || ${NO_SHARED} == "no" || ${NO_SHARED} == "NO")
CFLAGS+= -fPIE CFLAGS+= -fPIE
CXXFLAGS+= -fPIE CXXFLAGS+= -fPIE
LDFLAGS+= -pie LDFLAGS+= -pie
@ -48,7 +47,7 @@ LDFLAGS+= -pie
CFLAGS+= -mretpoline CFLAGS+= -mretpoline
CXXFLAGS+= -mretpoline CXXFLAGS+= -mretpoline
# retpolineplt is broken with static linking (PR 233336) # retpolineplt is broken with static linking (PR 233336)
.if !defined(NO_SHARED) || ${NO_SHARED} == "no" || ${NO_SHARED} == "NO" .if !defined(NO_SHARED) || ${NO_SHARED:tl} == "no"
LDFLAGS+= -Wl,-zretpolineplt LDFLAGS+= -Wl,-zretpolineplt
.endif .endif
.endif .endif
@ -74,7 +73,7 @@ TAGS+= package=${PACKAGE:Uruntime}
TAG_ARGS= -T ${TAGS:[*]:S/ /,/g} TAG_ARGS= -T ${TAGS:[*]:S/ /,/g}
.endif .endif
.if defined(NO_SHARED) && (${NO_SHARED} != "no" && ${NO_SHARED} != "NO") .if defined(NO_SHARED) && (${NO_SHARED:tl} != "no"
LDFLAGS+= -static LDFLAGS+= -static
.endif .endif

2
share/mk/src.libnames.mk
View File

@ -386,7 +386,7 @@ LDADD_${_l}?= ${LDADD_${_l}_L} -l${_l}
.endif .endif
# Add in all dependencies for static linkage. # Add in all dependencies for static linkage.
.if defined(_DP_${_l}) && (${_INTERNALLIBS:M${_l}} || \ .if defined(_DP_${_l}) && (${_INTERNALLIBS:M${_l}} || \
(defined(NO_SHARED) && (${NO_SHARED} != "no" && ${NO_SHARED} != "NO"))) (defined(NO_SHARED) && ${NO_SHARED:tl} != "no"))
.for _d in ${_DP_${_l}} .for _d in ${_DP_${_l}}
DPADD_${_l}+= ${DPADD_${_d}} DPADD_${_l}+= ${DPADD_${_d}}
LDADD_${_l}+= ${LDADD_${_d}} LDADD_${_l}+= ${LDADD_${_d}}