diff options
| author | Simon J. Gerraty <sjg@FreeBSD.org> | 2014-11-19 01:07:58 +0000 |
|---|---|---|
| committer | Simon J. Gerraty <sjg@FreeBSD.org> | 2014-11-19 01:07:58 +0000 |
| commit | 9268022b74279434ed6300244e3f977e56a8ceb5 (patch) | |
| tree | 377ac0ac449528621eb192cd245adadb5fd53668 /share/mk/bsd.prog.mk | |
| parent | 29c34e9d2781cf25403647fb5af7d7ddb23be7e1 (diff) | |
| parent | 8c3d6a4ab2a4a95d864d9a32d0157d7de90498a4 (diff) | |
| download | src-9268022b74279434ed6300244e3f977e56a8ceb5.tar.gz src-9268022b74279434ed6300244e3f977e56a8ceb5.zip | |
Merge from head@274682
Notes
Notes:
svn path=/projects/bmake/; revision=274683
Diffstat (limited to 'share/mk/bsd.prog.mk')
| -rw-r--r-- | share/mk/bsd.prog.mk | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk index f6d2f208f5a1..b5ec0687e484 100644 --- a/share/mk/bsd.prog.mk +++ b/share/mk/bsd.prog.mk @@ -11,18 +11,6 @@ CFLAGS+=${COPTS} .endif -.if ${MK_PIE} != "no" && (!defined(NO_PIE) || ${NO_PIE} == "no") -.if !defined(RESCUE) && !defined(NO_SHARED) -CFLAGS+= -fPIE -pie -LDFLAGS+= -pie -.elif defined(NO_SHARED) -.if ${NO_SHARED} == "no" || ${NO_SHARED} == "NO" -CFLAGS+= -fPIE -pie -LDFLAGS+= -pie -.endif -.endif -.endif - .if ${MK_ASSERT_DEBUG} == "no" CFLAGS+= -DNDEBUG NO_WERROR= @@ -41,9 +29,7 @@ CTFFLAGS+= -g PROG= ${PROG_CXX} .endif -.if defined(PROG) && target(${PROG}) -MK_DEBUG_FILES= no -.elif !empty(LDFLAGS:M-Wl,*--oformat,*) || !empty(LDFLAGS:M-static) +.if !empty(LDFLAGS:M-Wl,*--oformat,*) || !empty(LDFLAGS:M-static) MK_DEBUG_FILES= no .endif @@ -162,7 +148,8 @@ MAN1= ${MAN} .if defined(_SKIP_BUILD) all: .else -all: objwarn ${PROG} ${SCRIPTS} +all: beforebuild .WAIT ${PROG} ${SCRIPTS} +beforebuild: objwarn .if ${MK_MAN} != "no" all: _manpages .endif |