diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/Config | 9 | ||||
| -rw-r--r-- | test/Rules.mak | 89 |
2 files changed, 45 insertions, 53 deletions
diff --git a/test/Config b/test/Config deleted file mode 100644 index 80fc6b3d3..000000000 --- a/test/Config +++ /dev/null @@ -1,9 +0,0 @@ -# Configuration for uClibc test apps. - -# Set the following to `true' to make a debuggable build. -DODEBUG = true - -# If you want to compile using uClibc as a shared library, turn this on. -DODYNAMIC = true - - diff --git a/test/Rules.mak b/test/Rules.mak index 141cf10f6..ed759c2a5 100644 --- a/test/Rules.mak +++ b/test/Rules.mak @@ -1,13 +1,14 @@ -# Rules.make for uClibc test apps. +# Rules.mak for uClibc test subdirs # # Copyright (C) 2001 by Lineo, inc. # +# Note: This does not read the top level Rules.mak file # -#Note: This does not read the top level Rules.mak file -# --include $(TESTDIR)../.config -include $(TESTDIR)Config +TOPDIR = ../../ +TESTDIR=$(TOPDIR)test/ + +-include $(TOPDIR).config #-------------------------------------------------------- # Ensure consistent sort order, 'gcc -print-search-dirs' behavior, etc. @@ -16,17 +17,17 @@ export LC_ALL ifeq ($(strip $(TARGET_ARCH)),) TARGET_ARCH:=$(shell $(CC) -dumpmachine | sed -e s'/-.*//' \ - -e 's/i.86/i386/' \ - -e 's/sparc.*/sparc/' \ - -e 's/arm.*/arm/g' \ - -e 's/m68k.*/m68k/' \ - -e 's/ppc/powerpc/g' \ - -e 's/v850.*/v850/g' \ - -e 's/sh[234]/sh/' \ - -e 's/mips-.*/mips/' \ - -e 's/mipsel-.*/mipsel/' \ - -e 's/cris.*/cris/' \ - ) + -e 's/i.86/i386/' \ + -e 's/sparc.*/sparc/' \ + -e 's/arm.*/arm/g' \ + -e 's/m68k.*/m68k/' \ + -e 's/ppc/powerpc/g' \ + -e 's/v850.*/v850/g' \ + -e 's/sh[234]/sh/' \ + -e 's/mips-.*/mips/' \ + -e 's/mipsel-.*/mipsel/' \ + -e 's/cris.*/cris/' \ + ) endif export TARGET_ARCH @@ -41,16 +42,15 @@ export TARGET_ARCH # make CROSS=mipsel-linux- # will build uClibc for 'mipsel'. -CROSS= -CC= $(CROSS)gcc -STRIPTOOL=strip -LDD=../$(TOPDIR)/utils/ldd - -RM= rm -f +CROSS = +CC = $(CROSS)gcc +STRIPTOOL = strip +LDD = $(TOPDIR)utils/ldd +RM = rm -f # Select the compiler needed to build binaries for your development system -HOSTCC=gcc -HOSTCFLAGS=-O2 -Wall +HOSTCC = gcc +HOSTCFLAGS = -O2 -Wall #-------------------------------------------------------- @@ -62,31 +62,32 @@ check_gcc=$(shell if $(CC) $(1) -S -o /dev/null -xc /dev/null > /dev/null 2>&1; then echo "$(1)"; else echo "$(2)"; fi) # use '-Os' optimization if available, else use -O2, allow Config to override -OPTIMIZATION+=$(call check_gcc,-Os,-O2) # Override optimization settings when debugging -ifeq ($(DODEBUG),true) -OPTIMIZATION=-O0 +ifeq ($(DODEBUG),y) +OPTIMIZATION = -O0 +else +OPTIMIZATION += $(call check_gcc,-Os,-O2) endif -XWARNINGS=$(subst ",, $(strip $(WARNINGS))) -Wstrict-prototypes -XARCH_CFLAGS=$(subst ",, $(strip $(ARCH_CFLAGS))) -CFLAGS=$(XWARNINGS) $(OPTIMIZATION) $(XARCH_CFLAGS) -GLIBC_CFLAGS+=$(XWARNINGS) $(OPTIMIZATION) -LDFLAGS= +XWARNINGS = $(subst ",, $(strip $(WARNINGS))) -Wstrict-prototypes +XARCH_CFLAGS = $(subst ",, $(strip $(ARCH_CFLAGS))) +CFLAGS = $(XWARNINGS) $(OPTIMIZATION) $(XARCH_CFLAGS) +GLIBC_CFLAGS += $(XWARNINGS) $(OPTIMIZATION) +LDFLAGS = -ifeq ($(DODEBUG),true) - CFLAGS+=-g - GLIBC_CFLAGS+=-g - LDFLAGS += -g -Wl,-warn-common - GLIBC_LDFLAGS =-g -Wl,-warn-common - STRIPTOOL =true -Since_we_are_debugging +ifeq ($(DODEBUG),y) + CFLAGS += -g + GLIBC_CFLAGS += -g + LDFLAGS += -g -Wl,-warn-common + GLIBC_LDFLAGS = -g -Wl,-warn-common + STRIPTOOL = true -Since_we_are_debugging else - LDFLAGS +=-s -Wl,-warn-common - GLIBC_LDFLAGS =-s -Wl,-warn-common - STRIP = $(STRIPTOOL) --remove-section=.note --remove-section=.comment $(PROG) + LDFLAGS += -s -Wl,-warn-common + GLIBC_LDFLAGS = -s -Wl,-warn-common + STRIP = $(STRIPTOOL) --remove-section=.note --remove-section=.comment $(PROG) endif -ifneq ($(DODYNAMIC),true) - LDFLAGS +=-static - GLIBC_LDFLAGS +=-static +ifneq ($(strip $(HAVE_SHARED)),y) + LDFLAGS += -static + GLIBC_LDFLAGS += -static endif |