Merge branch 'master' of git.lfbs.rwth-aachen.de:metalsvm into fork

This commit is contained in:
Stefan Lankes 2011-02-17 17:01:55 +01:00
commit 520924b5d9
2 changed files with 3 additions and 3 deletions

View file

@ -44,13 +44,13 @@ all: newlib tools $(NAME)
# $(OBJCOPY) $(STRIP_DEBUG) $(NAME)
newlib:
$(MAKE) ARCH=$(ARCH) CFLAGS="-m32 -O2 -march=i586 -fno-stack-protector" NASMFLAGS="-felf32 -g" -C newlib
$(MAKE) ARCH=$(ARCH) LDFLAGS="-m32" CFLAGS="-m32 -O2 -march=i586 -fno-stack-protector" NASMFLAGS="-felf32 -g" -C newlib
tools:
$(MAKE) -C tools
$(NAME):
@echo [LD] $(NAME)
$Q$(LD) $(LDFLAGS) -o $(NAME) $^
@echo [OBJCOPY] $(SYM_NAME)
$Q$(OBJCOPY) $(KEEP_DEBUG) $(NAME) $(SYM_NAME)

View file

@ -33,7 +33,7 @@ export NASMFLAGS
default: $(ARCH)
$(MAKE) -C examples depend
$(MAKE) CFLAGS+="-nostdinc -Wall -fno-builtin -I$(NEWLIB)/include -I../../include -I../../arch/$(ARCH)/include" LDFLAGS="-nostdlib -L$(NEWLIB)/lib" -C examples
$(MAKE) CFLAGS+="-nostdinc -Wall -fno-builtin -I$(NEWLIB)/include -I../../include -I../../arch/$(ARCH)/include" LDFLAGS+="-nostdlib -L$(NEWLIB)/lib" -C examples
$(ARCH):
$(RM) $(TMP)