You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stdcxx.apache.org by se...@apache.org on 2006/10/14 00:12:21 UTC
svn commit: r463850 - in /incubator/stdcxx/trunk/etc/config: makefile.common
makefile.rules
Author: sebor
Date: Fri Oct 13 15:12:16 2006
New Revision: 463850
URL: http://svn.apache.org/viewvc?view=rev&rev=463850
Log:
2006-10-13 Martin Sebor <se...@roguewave.com>
* makefile.common (TEEOPTS): Reverted previous change (rev 463535).
* makefile.rules (%.o: %(AS_EXT), %.o: %.cpp, %: %.o, %: %.cpp):
Reverted previous change and removed $(TEEOPTS) from compile/link
lines so as to prevent the pipeline from masking compilation and/or
linking errors.
Modified:
incubator/stdcxx/trunk/etc/config/makefile.common
incubator/stdcxx/trunk/etc/config/makefile.rules
Modified: incubator/stdcxx/trunk/etc/config/makefile.common
URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/etc/config/makefile.common?view=diff&rev=463850&r1=463849&r2=463850
==============================================================================
--- incubator/stdcxx/trunk/etc/config/makefile.common (original)
+++ incubator/stdcxx/trunk/etc/config/makefile.common Fri Oct 13 15:12:16 2006
@@ -143,10 +143,8 @@
# if LOGFILE is being created, tee command output into it
# IMPORTANT: $(TEEOPTS) must be last on the command line
-ifeq ($(LOGFILE),/dev/null)
- TEEOPTS = 2>&1 | tee $@.log
-else
- TEEOPTS = 2>&1 | tee $@.log | tee -a $(LOGFILE)
+ifneq ($(LOGFILE),/dev/null)
+ TEEOPTS = 2>&1 | tee -a $(LOGFILE)
endif
# determine the name of the results file against which to compute regressions
Modified: incubator/stdcxx/trunk/etc/config/makefile.rules
URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/etc/config/makefile.rules?view=diff&rev=463850&r1=463849&r2=463850
==============================================================================
--- incubator/stdcxx/trunk/etc/config/makefile.rules (original)
+++ incubator/stdcxx/trunk/etc/config/makefile.rules Fri Oct 13 15:12:16 2006
@@ -60,16 +60,16 @@
ifneq ($(AS_EXT),".")
%.o: %$(AS_EXT)
- $(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $< $(TEEOPTS)
+ $(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $<
endif # ifneq ($(AS_EXT),".")
endif # ifneq ($(AS_EXT),)
%.o: %.cpp
- $(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $< $(TEEOPTS)
+ $(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $<
%: %.o
- $(LD) $< -o $@ $(LDFLAGS) $(LDLIBS) $(TEEOPTS)
+ $(LD) $< -o $@ $(LDFLAGS) $(LDLIBS)
# disable compilation and linking in the same step
# %: %.cpp
@@ -78,7 +78,7 @@
# compile and link in one step to eliminate the space overhead of .o files
%: %.cpp
- $(CXX) $< -o $@ $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) $(LDLIBS) $(TEEOPTS)
+ $(CXX) $< -o $@ $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) $(LDLIBS)
endif # eq ($(NO_DOT_O),)