diff options
Diffstat (limited to 'mdk-stage1/Makefile.common')
| -rw-r--r-- | mdk-stage1/Makefile.common | 33 |
1 files changed, 6 insertions, 27 deletions
diff --git a/mdk-stage1/Makefile.common b/mdk-stage1/Makefile.common index fc4372851..f2c70273a 100644 --- a/mdk-stage1/Makefile.common +++ b/mdk-stage1/Makefile.common @@ -1,7 +1,7 @@ # -*- makefile -*- #****************************************************************************** # - # Guillaume Cottenceau (gc@mandriva.com) + # Guillaume Cottenceau (gc) # # Copyright 2000 Mandriva # @@ -15,7 +15,7 @@ #***************************************************************************** ARCH := $(patsubst i%86,i386,$(shell uname -m)) -ARCH := $(patsubst sparc%,sparc,$(ARCH)) +ARCH := $(ARCH:arm%=arm) # DEBUG = 1 @@ -26,39 +26,18 @@ else F = NEWT endif -DIET = $(shell test -x /usr/bin/diet && echo diet) - -ifeq ($(DIET), diet) - #- default lib is dietlibc (honoured by main Makefile whenever possible) -L = DIETLIBC -else -L = GLIBC -endif - ifdef DEBUG -OPTFLAGS = -g +OPTFLAGS = -g -DDEBUG else OPTFLAGS = -Os endif #- flags used by all stuff -CFLAGS = $(OPTFLAGS) -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. -DIETLIBC_LIBC = /usr/lib/dietlibc/lib-$(ARCH)/libcompat.a -GLIBC_INCLUDES = -I. -INCLUDES = $($(L)_INCLUDES) +CFLAGS = $(OPTFLAGS) -pipe -Wall -fomit-frame-pointer -fno-strict-aliasing -Werror -GLIBC_LDFLAGS = -static -LDFLAGS = $($(L)_LDFLAGS) +INCLUDES = -I. -STAGE1_LIBC = $($(L)_LIBC) +LDFLAGS = ifdef DEBUG STRIPCMD = echo not stripping |