Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

HVM-690 ctfmerge isn't in the default path

  • Loading branch information...
commit 2d6f3c6af6a33bd17364fe9c314294a3e72cb5c3 1 parent b798416
@JohnSonnenschein JohnSonnenschein authored
Showing with 6 additions and 3 deletions.
  1. +6 −2 Makefile.joyent
  2. +0 −1  Makefile.target
View
8 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
View
1  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))
Please sign in to comment.
Something went wrong with that request. Please try again.