summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Mustacchi <rm@joyent.com>2011-11-19 02:26:05 +0000
committerRobert Mustacchi <rm@joyent.com>2011-11-19 02:26:05 +0000
commitb7984166ada8fb1a25bbdf98343a132528fc3360 (patch)
treec96824ad19934b86d44a58b9b6cc66c67d19b84d
parent0fc8719996feb46a3718daaea07176e09a33bf51 (diff)
downloadillumos-kvm-cmd-b7984166ada8fb1a25bbdf98343a132528fc3360.tar.gz
HVM-690 ctfmerge isn't in the default path
-rw-r--r--Makefile.target3
-rwxr-xr-xbuild.sh8
2 files changed, 10 insertions, 1 deletions
diff --git a/Makefile.target b/Makefile.target
index ca0a740..f5db347 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -378,7 +378,8 @@ obj-y += $(addprefix ../, $(trace-obj-y))
obj-$(CONFIG_GDBSTUB_XML) += gdbstub-xml.o
#
-# Uh, ctfconvert and ctfmerge are in our paths... right...
+# Uh, ctfconvert and ctfmerge are in our paths... right... I promise I'll clean
+# this up.
#
ifeq ($(TRACE_BACKEND),dtrace)
diff --git a/build.sh b/build.sh
index 1d933e1..c66f29b 100755
--- a/build.sh
+++ b/build.sh
@@ -58,5 +58,13 @@ if [[ $? != 0 ]]; then
exit 1
fi
+
+#
+# Make sure ctf utilities are in our path
+#
+KERNEL_SOURCE=$(pwd)/../../illumos
+CTFBINDIR=$KERNEL_SOURCE/usr/src/tools/proto/root_i386-nd/opt/onbld/bin/i386
+export PATH=$PATH:$CTFBINDIR
+
echo "==> Make"
gmake