Box: Let 32-/64-bit mode be configurable

[moe.git] / box / Makefile

diff --git a/box/Makefile b/box/Makefile
index 7f7150115554cd12e89ea89254bf8ef3d8bf6a03..c5d6b2a612402c8388ef9abaa8b9e22ed5963cb5 100644 (file)
--- a/box/Makefile
+++ b/box/Makefile
@@ -4,14 +4,19 @@
 DIRS+=box
 PROGS+=$(o)/box/box
 
-BOX_CFLAGS=-m64 -DCONFIG_BOX_AMD64
+BOX_CFLAGS=
+ifdef CONFIG_BOX_KERNEL_AMD64
+BOX_CFLAGS += -m64
+endif
 
 $(o)/box/box: $(o)/box/box.o
 $(o)/box/box.o: $(o)/box/syscall-table.h
+
+$(o)/box/box: LDFLAGS+=$(BOX_CFLAGS)
 $(o)/box/box.o: CFLAGS+=$(BOX_CFLAGS)
 
 $(o)/box/syscall-table.h: $(s)/box/mk-syscall-table
-       sh $^ >$@ $(BOX_CFLAGS)
+       sh $^ >$@ $(CFLAGS) $(BOX_CFLAGS)
 
 box-tests: $(addprefix $(o)/box/test-sys,32-int80 64-int80 32-syscall 64-syscall 32-sysenter 64-sysenter)