summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter S. Mazinger <ps.m@gmx.net>2006-03-01 21:05:21 +0000
committerPeter S. Mazinger <ps.m@gmx.net>2006-03-01 21:05:21 +0000
commitf93630e571838c5d3acea842008415c3e0f36948 (patch)
tree517c657d5f64c6a88164e90c47f6cf3941273d06
parent84f59ea0e020deb280dc1bced08ee8aa8176292f (diff)
Add CFLAGS-OMIT support to glibc targets for now being the same as for uclibc targets, adapt regex
-rw-r--r--test/Test.mak4
-rw-r--r--test/regex/Makefile14
2 files changed, 9 insertions, 9 deletions
diff --git a/test/Test.mak b/test/Test.mak
index 47bacebdf..17497a61e 100644
--- a/test/Test.mak
+++ b/test/Test.mak
@@ -73,7 +73,7 @@ endef
$(U_TARGETS):
$(showlink)
- $(Q)$(CC) $(filter-out $(CFLAGS-OMIT_$@.c),$(CFLAGS)) $(EXTRA_CFLAGS) $(CFLAGS_$@) -c $@.c -o $@.o
+ $(Q)$(CC) $(filter-out $(CFLAGS-OMIT_$@),$(CFLAGS)) $(EXTRA_CFLAGS) $(CFLAGS_$@) -c $@.c -o $@.o
$(Q)$(CC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LDFLAGS) $(LDFLAGS_$@)
ifeq ($(COMPILE_ONLY),)
$(exec_test)
@@ -82,7 +82,7 @@ endif
$(G_TARGETS):
$(showlink)
- $(Q)$(HOSTCC) $(HOST_CFLAGS) $(EXTRA_CFLAGS) $(CFLAGS_$(patsubst %_glibc,%,$@)) -c $(patsubst %_glibc,%,$@).c -o $@.o
+ $(Q)$(HOSTCC) $(filter-out $(CFLAGS-OMIT_$(patsubst %_glibc,%,$@)),$(HOST_CFLAGS)) $(EXTRA_CFLAGS) $(CFLAGS_$(patsubst %_glibc,%,$@)) -c $(patsubst %_glibc,%,$@).c -o $@.o
$(Q)$(HOSTCC) $(HOST_LDFLAGS) $@.o -o $@ $(EXTRA_LDFLAGS) $(LDFLAGS_$(patsubst %_glibc,%,$@))
ifeq ($(COMPILE_ONLY),)
$(exec_test)
diff --git a/test/regex/Makefile b/test/regex/Makefile
index 849b674e8..9ad289ab2 100644
--- a/test/regex/Makefile
+++ b/test/regex/Makefile
@@ -7,13 +7,13 @@ include ../Test.mak
CFLAGS_tst-regex2 := -std=c99
-CFLAGS-OMIT_testregex.c := -D_GNU_SOURCE
-CFLAGS-OMIT_testregexc.c := -D_GNU_SOURCE
-CFLAGS-OMIT_testregexf.c := -D_GNU_SOURCE
-CFLAGS-OMIT_testregexl.c := -D_GNU_SOURCE
-CFLAGS-OMIT_testregexn.c := -D_GNU_SOURCE
-CFLAGS-OMIT_testregexp.c := -D_GNU_SOURCE
-CFLAGS-OMIT_testregexr.c := -D_GNU_SOURCE
+CFLAGS-OMIT_testregex := -D_GNU_SOURCE
+CFLAGS-OMIT_testregexc := -D_GNU_SOURCE
+CFLAGS-OMIT_testregexf := -D_GNU_SOURCE
+CFLAGS-OMIT_testregexl := -D_GNU_SOURCE
+CFLAGS-OMIT_testregexn := -D_GNU_SOURCE
+CFLAGS-OMIT_testregexp := -D_GNU_SOURCE
+CFLAGS-OMIT_testregexr := -D_GNU_SOURCE
OPTS_testregex := < basic.dat
OPTS_testregexc := < categorize.dat