Return-Path: Delivered-To: apmail-incubator-stdcxx-commits-archive@www.apache.org Received: (qmail 32670 invoked from network); 13 Oct 2006 22:12:43 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 13 Oct 2006 22:12:43 -0000 Received: (qmail 7275 invoked by uid 500); 13 Oct 2006 22:12:43 -0000 Delivered-To: apmail-incubator-stdcxx-commits-archive@incubator.apache.org Received: (qmail 7260 invoked by uid 500); 13 Oct 2006 22:12:43 -0000 Mailing-List: contact stdcxx-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: stdcxx-dev@incubator.apache.org Delivered-To: mailing list stdcxx-commits@incubator.apache.org Received: (qmail 7249 invoked by uid 99); 13 Oct 2006 22:12:42 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 13 Oct 2006 15:12:42 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 13 Oct 2006 15:12:42 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 08B491A981A; Fri, 13 Oct 2006 15:12:21 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r463850 - in /incubator/stdcxx/trunk/etc/config: makefile.common makefile.rules Date: Fri, 13 Oct 2006 22:12:21 -0000 To: stdcxx-commits@incubator.apache.org From: sebor@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20061013221222.08B491A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N 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 * 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),)