1 --- illumos-kvm-c24f295/Makefile.~1~ 2015-09-17 23:24:14.419153315 +0300
2 +++ illumos-kvm-c24f295/Makefile 2015-09-17 23:26:10.563761662 +0300
4 # Copyright 2015 Joyent, Inc.
7 -KERNEL_SOURCE = $(PWD)/../../illumos
8 +KERNEL_SOURCE = $(PWD)/../../../illumos-gate/illumos-gate
9 MDB_SOURCE = $(KERNEL_SOURCE)/usr/src/cmd/mdb
10 -PROTO_AREA = $(PWD)/../../../proto
11 -STRAP_AREA = $(PWD)/../../../proto.strap
12 +PROTO_AREA = $(PWD)/../../../illumos-gate/illumos-gate/proto/root_i386
14 -CC = $(STRAP_AREA)/usr/bin/gcc
15 +CC = /opt/gcc/4.4.4/bin/gcc
17 -CTFBINDIR = $(KERNEL_SOURCE)/usr/src/tools/proto/*/opt/onbld/bin/i386
18 +CTFBINDIR = /opt/onbld/bin/i386
19 CTFCONVERT = $(CTFBINDIR)/ctfconvert
20 CTFMERGE = $(CTFBINDIR)/ctfmerge
21 CSTYLE = $(KERNEL_SOURCE)/usr/src/tools/scripts/cstyle