aboutsummaryrefslogtreecommitdiffstats
path: root/Mk
diff options
context:
space:
mode:
Diffstat (limited to 'Mk')
-rw-r--r--Mk/Uses/cargo.mk2
-rw-r--r--Mk/bsd.port.mk5
2 files changed, 5 insertions, 2 deletions
diff --git a/Mk/Uses/cargo.mk b/Mk/Uses/cargo.mk
index 1037df26792b..87d1d9b22e69 100644
--- a/Mk/Uses/cargo.mk
+++ b/Mk/Uses/cargo.mk
@@ -103,7 +103,7 @@ CARGO_INSTALL_ARGS+= --features='${CARGO_FEATURES}'
CARGO_TEST_ARGS+= --features='${CARGO_FEATURES}'
.endif
-.if !defined(WITH_DEBUG) || defined(WITHOUT_DEBUG)
+.if !defined(WITH_DEBUG)
CARGO_BUILD_ARGS+= --release
CARGO_TEST_ARGS+= --release
.else
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
index 440b9eaec9ec..f22f2091fb1f 100644
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -337,6 +337,9 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org
# passed to the compiler by setting DEBUG_FLAGS. It is
# set to "-g" at default.
#
+# NOTE: to override a globally defined WITH_DEBUG at a
+# later time ".undef WITH_DEBUG" can be used
+#
# WITH_DEBUG_PORTS - A list of origins for which WITH_DEBUG will be set
#
# WITHOUT_SSP - Disable SSP.
@@ -1681,7 +1684,7 @@ CFLAGS:= ${CFLAGS:C/${_CPUCFLAGS}//}
.endif
# Reset value from bsd.own.mk.
-.if defined(WITH_DEBUG) && !defined(WITHOUT_DEBUG)
+.if defined(WITH_DEBUG)
.if !defined(INSTALL_STRIPPED)
STRIP= #none
MAKE_ENV+= DONTSTRIP=yes