aboutsummaryrefslogtreecommitdiff
path: root/cddl/usr.sbin
diff options
context:
space:
mode:
authorMark Johnston <markj@FreeBSD.org>2017-11-27 17:54:17 +0000
committerMark Johnston <markj@FreeBSD.org>2017-11-27 17:54:17 +0000
commitf4b90f5a5cc1e9ad229183bc6d0c3d1e769d6b32 (patch)
tree82b63764fc6c208fb19c7579d8c429e73fb1d965 /cddl/usr.sbin
parentd2b677cef60316393f44656800d667e9cffde9e6 (diff)
downloadsrc-f4b90f5a5cc1e9ad229183bc6d0c3d1e769d6b32.tar.gz
src-f4b90f5a5cc1e9ad229183bc6d0c3d1e769d6b32.zip
Revert r326181 for now.
We can't link an executable using -m32 until the lib32 phase of a buildworld, though the build works fine when executing make from cddl/usr.sbin/dtrace/tests. Some other solution will need to be found.
Notes
Notes: svn path=/head/; revision=326285
Diffstat (limited to 'cddl/usr.sbin')
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/probes/Makefile1
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/speculation/Makefile1
-rw-r--r--cddl/usr.sbin/dtrace/tests/common/uctf/Makefile2
-rwxr-xr-xcddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh2
4 files changed, 2 insertions, 4 deletions
diff --git a/cddl/usr.sbin/dtrace/tests/common/probes/Makefile b/cddl/usr.sbin/dtrace/tests/common/probes/Makefile
index 7e02b9a73900..4adb82857b08 100644
--- a/cddl/usr.sbin/dtrace/tests/common/probes/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/probes/Makefile
@@ -35,4 +35,5 @@ CFILES= \
tst.probestar.c \
+
.include "../../dtrace.test.mk"
diff --git a/cddl/usr.sbin/dtrace/tests/common/speculation/Makefile b/cddl/usr.sbin/dtrace/tests/common/speculation/Makefile
index 5afee0225e89..eb871e9585e7 100644
--- a/cddl/usr.sbin/dtrace/tests/common/speculation/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/speculation/Makefile
@@ -70,6 +70,7 @@ ${PACKAGE}FILES= \
TESTEXES= \
tst.NoSpecBuffer.exe \
+
CFILES= \
diff --git a/cddl/usr.sbin/dtrace/tests/common/uctf/Makefile b/cddl/usr.sbin/dtrace/tests/common/uctf/Makefile
index 01f0336fcc40..945a853b69df 100644
--- a/cddl/usr.sbin/dtrace/tests/common/uctf/Makefile
+++ b/cddl/usr.sbin/dtrace/tests/common/uctf/Makefile
@@ -40,6 +40,4 @@ CFILES= \
WITH_CTF=YES
-CFLAGS.tst.chasestrings.exe+= -m32
-
.include "../../dtrace.test.mk"
diff --git a/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh b/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh
index 8487387c62a1..767b22f57783 100755
--- a/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh
+++ b/cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh
@@ -53,8 +53,6 @@ TEST_METADATA.t_dtrace_contrib+= required_memory=\"4g\"
uctf)
special="
WITH_CTF=YES
-
-CFLAGS.tst.chasestrings.exe+= -m32
"
;;
esac