Merge branch 'scale-amd64' of git+ssh://pdos.csail.mit.edu/home/am0/6.828/xv6 into scale-amd64

7ff543f9 · Nickolai Zeldovich · ad992686 · 04bd0def · 7ff543f9
--- a/Makefile
+++ b/Makefile
@@ -11,10 +11,12 @@ QEMUSMP	   ?= 4
 QEMUSRC    ?= ../mtrace
 MTRACE	   ?= $(QEMU)
 HW	   ?= qemu
+O  	   = o.$(HW)
-O  = o.$(HW)
+ifndef CONFIG_MK
-CC ?= $(TOOLPREFIX)gcc
+CC = $(TOOLPREFIX)gcc
-CXX ?= $(TOOLPREFIX)g++
+CXX = $(TOOLPREFIX)g++
+endif
 LD = $(TOOLPREFIX)ld
 NM = $(TOOLPREFIX)nm
 OBJCOPY = $(TOOLPREFIX)objcopy