diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2007-04-25 12:26:16 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2007-04-25 12:26:16 +0000 |
| commit | 126777bc019a54afb4ec51299f2cf9d2841698aa (patch) | |
| tree | 97f76e571902ead55ba138f1156a4b4f00b9b779 /mdk-stage1/Makefile.common | |
| parent | f1f67448efc714873378dfeb8279fae68054a90a (diff) | |
| download | drakx-126777bc019a54afb4ec51299f2cf9d2841698aa.tar drakx-126777bc019a54afb4ec51299f2cf9d2841698aa.tar.gz drakx-126777bc019a54afb4ec51299f2cf9d2841698aa.tar.bz2 drakx-126777bc019a54afb4ec51299f2cf9d2841698aa.tar.xz drakx-126777bc019a54afb4ec51299f2cf9d2841698aa.zip | |
re-sync after the big svn loss
Diffstat (limited to 'mdk-stage1/Makefile.common')
| -rw-r--r-- | mdk-stage1/Makefile.common | 22 |
1 files changed, 10 insertions, 12 deletions
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 |