From 126777bc019a54afb4ec51299f2cf9d2841698aa Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Wed, 25 Apr 2007 12:26:16 +0000 Subject: re-sync after the big svn loss --- mdk-stage1/Makefile.common | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) (limited to 'mdk-stage1/Makefile.common') diff --git a/mdk-stage1/Makefile.common b/mdk-stage1/Makefile.common index ce8aab84c..b668fab27 100644 --- a/mdk-stage1/Makefile.common +++ b/mdk-stage1/Makefile.common @@ -17,32 +17,30 @@ ARCH := $(patsubst i%86,i386,$(shell uname -m)) ARCH := $(patsubst sparc%,sparc,$(ARCH)) - #- default lib is dietlibc (honoured by main Makefile whenever possible) -L = DIETLIBC -#L = GLIBC - #- default frontend is newt (honoured by main Makefile whenever possible) F = NEWT # F = STDIO - #- override in some situations -ifeq (ia64, $(ARCH)) -L = GLIBC -endif +DIET = $(shell test -x /usr/bin/diet && echo diet) -ifeq (DIETLIBC, $(L)) -DIET = diet +ifeq ($(DIET), diet) + #- default lib is dietlibc (honoured by main Makefile whenever possible) +L = DIETLIBC +else +L = GLIBC endif #- flags used by all stuff CFLAGS = -Os -pipe -Wall -fomit-frame-pointer -fno-strict-aliasing ifneq (ppc, $(ARCH)) +ifneq (sparc, $(ARCH)) CFLAGS += -Werror endif +endif -DIETLIBC_INCLUDES = -I/usr/lib/dietlibc/include -I. -I$(top_dir)/bzlib -GLIBC_INCLUDES = -I. -I$(top_dir)/bzlib +DIETLIBC_INCLUDES = -I/usr/lib/dietlibc/include -I. +GLIBC_INCLUDES = -I. INCLUDES = $($(L)_INCLUDES) GLIBC_LDFLAGS = -static -- cgit v1.2.1