3 files changed, 14 insertions, 4 deletions
diff --git a/mk/build.mk b/mk/build.mk
index 9f1841cc2..7c8a697f8 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -554,6 +554,7 @@ bulkallmod:
 	done
 
 ${TOPDIR}/bin/tools/pkgmaker:
+	@mkdir -p $(TOPDIR)/bin/tools
 	@$(HOSTCC) -Wall -g -o $@ tools/adk/pkgmaker.c tools/adk/sortfile.c tools/adk/strmap.c
 
 ${TOPDIR}/bin/tools/pkgrebuild:
diff --git a/mk/buildhlp.mk b/mk/buildhlp.mk
index c7c598de3..2cb4f1714 100644
--- a/mk/buildhlp.mk
+++ b/mk/buildhlp.mk
@@ -24,9 +24,11 @@ else
 _CHECKSUM_COOKIE=
 endif
 
-post-extract:
+${PACKAGE_DIR}/.stamps:
 	@mkdir -p ${PACKAGE_DIR}/.stamps
 
+post-extract: ${PACKAGE_DIR}/.stamps
+
 ifeq ($(strip ${NO_DISTFILES}),1)
 ${WRKDIST}/.extract_done:
 	rm -rf ${WRKDIST} ${WRKSRC} ${WRKBUILD}
diff --git a/mk/vars.mk b/mk/vars.mk
index 37461e981..7828347d5 100644
--- a/mk/vars.mk
+++ b/mk/vars.mk
@@ -9,14 +9,23 @@ INSTALL_SCRIPT=		install -m0755
 MAKEFLAGS=		$(EXTRA_MAKEFLAGS)
 BUILD_USER=		$(shell id -un)
 BUILD_GROUP=		$(shell id -gn)
+
+# target compiler settings
+TARGET_CPPFLAGS+=	-I${STAGING_TARGET_DIR}/usr/include
+TARGET_LDFLAGS+=	-Wl,-O2
 ifneq ($(ADK_DEBUG),)
 TARGET_DEBUGGING:=	-g3 -fno-omit-frame-pointer
 else
-TARGET_DEBUGGING:=	-fomit-frame-pointer $(TARGET_OPTIMIZATION) 
+TARGET_DEBUGGING:=	$(TARGET_OPTIMIZATION) -fomit-frame-pointer
 endif
 TARGET_CFLAGS:=		$(TARGET_CFLAGS_ARCH) $(TARGET_DEBUGGING) -fwrapv
 ifneq ($(ADK_TOOLCHAIN_GCC_USE_SSP),)
 TARGET_CFLAGS+=		-fstack-protector
+TARGET_LDFLAGS+=	-fstack-protector
+endif
+ifneq ($(ADK_TOOLCHAIN_GCC_USE_LTO),)
+TARGET_CFLAGS+=		-flto
+TARGET_LDFLAGS+=	-flto
 endif
 
 BASE_DIR:=		$(TOPDIR)
@@ -56,8 +65,6 @@ endif
 TARGET_CC:=		${TARGET_COMPILER_PREFIX}gcc
 TARGET_CXX:=		${TARGET_COMPILER_PREFIX}g++
 TARGET_LD:=		${TARGET_COMPILER_PREFIX}ld
-TARGET_CPPFLAGS+=	-I${STAGING_TARGET_DIR}/usr/include
-TARGET_LDFLAGS+=	-Wl,-O2
 PATCH=			${BASH} $(SCRIPT_DIR)/patch.sh
 SED:=			sed -i -e
 LINUX_DIR:=		$(BUILD_DIR)/linux