|
@@ -99,12 +99,14 @@ $(MAKE_SRCS): Makefile $(TESTDIR)Makefile $(TESTDIR)Rules.mak $(TESTDIR)Test.mak
|
|
|
|
|
|
$(U_TARGETS): $(U_TARGET_SRCS) $(MAKE_SRCS)
|
|
$(U_TARGETS): $(U_TARGET_SRCS) $(MAKE_SRCS)
|
|
$(showlink)
|
|
$(showlink)
|
|
- $(Q)$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(CFLAGS_$(notdir $(CURDIR))) $(CFLAGS_$@) -c $@.c -o $@.o
|
|
+ $(Q)$(CC) $(filter-out $(CFLAGS-OMIT-$@),$(CFLAGS)) $(EXTRA_CFLAGS) $(CFLAGS_$(notdir $(CURDIR))) $(CFLAGS_$@) -c $@.c -o $@.o
|
|
$(Q)$(CC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LDFLAGS) $(LDFLAGS_$@)
|
|
$(Q)$(CC) $(LDFLAGS) $@.o -o $@ $(EXTRA_LDFLAGS) $(LDFLAGS_$@)
|
|
|
|
|
|
$(G_TARGETS): $(U_TARGET_SRCS) $(MAKE_SRCS)
|
|
$(G_TARGETS): $(U_TARGET_SRCS) $(MAKE_SRCS)
|
|
$(showlink)
|
|
$(showlink)
|
|
- $(Q)$(HOSTCC) $(HOST_CFLAGS) $(CFLAGS_$(notdir $(CURDIR))) $(CFLAGS_$(patsubst %_glibc,%,$@)) -c $(patsubst %_glibc,%,$@).c -o $@.o
|
|
+ $(Q)$(HOSTCC) $(filter-out $(HOST_CFLAGS-OMIT-$(patsubst %_glibc,%,$@)),$(HOST_CFLAGS)) \
|
|
|
|
+ $(CFLAGS_$(notdir $(CURDIR))) $(CFLAGS_$(patsubst %_glibc,%,$@)) \
|
|
|
|
+ -c $(patsubst %_glibc,%,$@).c -o $@.o
|
|
$(Q)$(HOSTCC) $(HOST_LDFLAGS) $@.o -o $@ $(EXTRA_LDFLAGS) $(LDFLAGS_$(patsubst %_glibc,%,$@))
|
|
$(Q)$(HOSTCC) $(HOST_LDFLAGS) $@.o -o $@ $(EXTRA_LDFLAGS) $(LDFLAGS_$(patsubst %_glibc,%,$@))
|
|
|
|
|
|
|
|
|
|
@@ -117,9 +119,11 @@ shell_%:
|
|
%.so: %.c
|
|
%.so: %.c
|
|
$(showlink)
|
|
$(showlink)
|
|
$(Q)$(CC) \
|
|
$(Q)$(CC) \
|
|
- $(CFLAGS) $(EXTRA_CFLAGS) $(CFLAGS_$(patsubst %_glibc,%,$@)) \
|
|
+ $(filter-out $(CFLAGS-OMIT-$<),$(CFLAGS)) $(EXTRA_CFLAGS) \
|
|
|
|
+ $(CFLAGS_$(patsubst %_glibc,%,$@)) \
|
|
-fPIC -shared $< -o $@ -Wl,-soname,$@ \
|
|
-fPIC -shared $< -o $@ -Wl,-soname,$@ \
|
|
- $(LDFLAGS) $(EXTRA_LIBS) $(LDFLAGS_$(patsubst %_glibc,%,$@))
|
|
+ $(filter-out $(LDFLAGS-OMIT-$<),$(LDFLAGS)) $(EXTRA_LIBS) \
|
|
|
|
+ $(LDFLAGS_$(patsubst %_glibc,%,$@))
|
|
|
|
|
|
clean:
|
|
clean:
|
|
$(showclean)
|
|
$(showclean)
|