projects
/
pintos-anon
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revise.
[pintos-anon]
/
src
/
Make.config
diff --git
a/src/Make.config
b/src/Make.config
index d4143b84b857119e1bffb419df05d5671bd70a29..8744f0da4a764c4022f72669668a498f271c6bea 100644
(file)
--- a/
src/Make.config
+++ b/
src/Make.config
@@
-2,6
+2,8
@@
SHELL = /bin/sh
SHELL = /bin/sh
+VPATH = $(SRCDIR)
+
# Binary utilities.
# If the host appears to be x86, use the normal tools.
# Otherwise assume cross-tools are installed as i386-elf-*.
# Binary utilities.
# If the host appears to be x86, use the normal tools.
# Otherwise assume cross-tools are installed as i386-elf-*.
@@
-16,15
+18,13
@@
LD = i386-elf-ld
OBJCOPY = i386-elf-objcopy
endif
OBJCOPY = i386-elf-objcopy
endif
-# Other utilities.
-DD = dd
-RM = rm
-CAT = cat
-
# Compiler and assembler invocation.
# Compiler and assembler invocation.
-WARNINGS = -Wall -W -Wstrict-prototypes -Wmissing-prototypes
-CFLAGS = -g -O3 -MMD -msoft-float
+DEFINES =
+WARNINGS = -Wall -W -Wstrict-prototypes -Wmissing-prototypes -Wsystem-headers
+CFLAGS = -g -MMD -msoft-float -masm=intel
+CPPFLAGS = -nostdinc -I$(SRCDIR) -I- -I$(SRCDIR)/lib
ASFLAGS = -Wa,--gstabs -MMD
ASFLAGS = -Wa,--gstabs -MMD
+LDFLAGS =
%.o: %.c
$(CC) -c $< -o $@ $(CFLAGS) $(CPPFLAGS) $(WARNINGS) $(DEFINES)
%.o: %.c
$(CC) -c $< -o $@ $(CFLAGS) $(CPPFLAGS) $(WARNINGS) $(DEFINES)