diff options
| author | John Sonnenschein <johns@joyent.com> | 2011-11-22 00:48:14 +0000 |
|---|---|---|
| committer | John Sonnenschein <johns@joyent.com> | 2011-11-22 00:48:14 +0000 |
| commit | 2d6f3c6af6a33bd17364fe9c314294a3e72cb5c3 (patch) | |
| tree | 08761386df2a8e28764e6345220121984a842ad9 | |
| parent | b7984166ada8fb1a25bbdf98343a132528fc3360 (diff) | |
| download | illumos-kvm-cmd-2d6f3c6af6a33bd17364fe9c314294a3e72cb5c3.tar.gz | |
HVM-690 ctfmerge isn't in the default path
| -rw-r--r-- | Makefile.joyent | 8 | ||||
| -rw-r--r-- | Makefile.target | 1 |
2 files changed, 6 insertions, 3 deletions
diff --git a/Makefile.joyent b/Makefile.joyent index c1e42a6..6d80317 100644 --- a/Makefile.joyent +++ b/Makefile.joyent @@ -19,9 +19,12 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. # +KERNEL_SOURCE=$(PWD)/../../illumos +CTFBINDIR=$(KERNEL_SOURCE)/usr/src/tools/proto/*/opt/onbld/bin/i386 world: - ./build.sh + echo "Building world" + PATH=$(PATH):$(CTFBINDIR) ./build.sh update: git pull --rebase @@ -30,7 +33,8 @@ manifest: cp manifest $(DESTDIR)/$(DESTNAME) install: world - DESTDIR=$(DESTDIR) gmake install + echo "Building install" + DESTDIR=$(DESTDIR) PATH=$(PATH):$(CTFBINDIR) gmake install clean: gmake clean diff --git a/Makefile.target b/Makefile.target index f5db347..1b57554 100644 --- a/Makefile.target +++ b/Makefile.target @@ -388,7 +388,6 @@ $(QEMU_PROG): $(obj-y) $(obj-$(TARGET_BASE_ARCH)-y) $(call quiet-command, dtrace $(CONFIG_DTRACE_FLAGS) -o ../trace-dtrace.o -s ../trace-dtrace.dtrace -G $(obj-y) $(obj-$(TARGET_BASE_ARCH)-y)," LINK $(TARGET_DIR)$@.dtrace") $(call quiet-command, find ../ -type f -name '*.o' -exec ../ctf.sh '{}' \;) $(call LINK,$(obj-y) $(obj-$(TARGET_BASE_ARCH)-y)) - $(call quiet-command, ctfmerge -L VERSION -o $@ $(obj-y) $(obj-$(TARGET_BASE_ARCH)-y)) else $(QEMU_PROG): $(obj-y) $(obj-$(TARGET_BASE_ARCH)-y) $(call LINK,$(obj-y) $(obj-$(TARGET_BASE_ARCH)-y)) |