[git commit] buildsys: prettify V=1

Bernhard Reutner-Fischer rep.dot.nop at gmail.com
Fri Jul 26 10:57:16 UTC 2013


commit: http://git.uclibc.org/uClibc++/commit/?id=0422e53160225e9f2460dbc595377a1d7caed902
branch: http://git.uclibc.org/uClibc++/commit/?id=refs/heads/master

---
 Rules.mak       |    2 +-
 bin/Makefile.in |    3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/Rules.mak b/Rules.mak
index 39e4245..f4749c9 100644
--- a/Rules.mak
+++ b/Rules.mak
@@ -291,7 +291,7 @@ endif
 
 show_objs = $(subst $(top_builddir),,$(subst ../,,$@))
 define show_defs
-	$(filter -D%,$(1))
+	$(filter -D%,$(call unwrapper,$(1)))
 endef
 define show_ldflags
 	$(subst $(comma), ,$(subst -Wl$(comma),,$(filter -Wl%,$(1))))
diff --git a/bin/Makefile.in b/bin/Makefile.in
index 80b45bf..6fc1129 100644
--- a/bin/Makefile.in
+++ b/bin/Makefile.in
@@ -15,7 +15,6 @@ manual.depends.dep += $(BIN_DIR)env_check
 $(BIN_DIR)env_check:
 	@echo 'cmd_$(call variablify,$(call dirify,$(WRAPPER))) := $(cmd_bin_env_check)' > $@.new
 	@echo '' >> $@.new
-	@echo "\$$(if \$$(Q),,\$$(info read $@))" >> $@.new
 	@if cmp -s $@ $@.new ; then \
 		$(RM) $@.new ; \
 	 else \
@@ -52,7 +51,7 @@ define do_wrapper
 	$(Q)echo '	WRAPPER_OPTIONS="$$WRAPPER_OPTIONS -nodefaultlibs $$WRAPPER_LIBDIR -l$(LNAME) $$WRAPPER_LIBS"' >> $@.tmp
 	$(Q)echo 'fi' >> $@.tmp
 	$(Q)echo '' >> $@.tmp
-	$(Q)echo '[ -n "$$V" ] && [ $$V -eq 1 ] && echo $(CXX) $(GEN_CFLAGS) $(GEN_CXXFLAGS) $(EH_CXXFLAGS) $$WRAPPER_INCLUDEDIR $$WRAPPER_OPTIONS' >> $@.tmp
+	$(Q)echo '[ -n "$$V" ] && [ $$V -gt 1 ] && echo $(CXX) $(GEN_CFLAGS) $(GEN_CXXFLAGS) $(EH_CXXFLAGS) $$WRAPPER_INCLUDEDIR $$WRAPPER_OPTIONS' >> $@.tmp
 	$(Q)echo 'exec $(CXX) $(GEN_CFLAGS) $(GEN_CXXFLAGS) $(EH_CXXFLAGS) $$WRAPPER_INCLUDEDIR $$WRAPPER_OPTIONS' >> $@.tmp
 	$(Q)echo '' >> $@.tmp
 	$(Q)chmod 0755 $@.tmp


More information about the uClibc-cvs mailing list