Return-Path: <dev-return-185165-archive-asf-public=cust-asf.ponee.io@tomcat.apache.org>
X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io
Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io
Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183])
	by cust-asf2.ponee.io (Postfix) with ESMTP id BB5F2200497
	for <archive-asf-public-internal@cust-asf2.ponee.io>; Wed, 23 Aug 2017 19:45:26 +0200 (CEST)
Received: by cust-asf.ponee.io (Postfix)
	id B9ADE169493; Wed, 23 Aug 2017 17:45:26 +0000 (UTC)
Delivered-To: archive-asf-public@cust-asf.ponee.io
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by cust-asf.ponee.io (Postfix) with SMTP id 0AFD516948E
	for <archive-asf-public@cust-asf.ponee.io>; Wed, 23 Aug 2017 19:45:25 +0200 (CEST)
Received: (qmail 57330 invoked by uid 500); 23 Aug 2017 17:45:24 -0000
Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:dev-help@tomcat.apache.org>
List-Unsubscribe: <mailto:dev-unsubscribe@tomcat.apache.org>
List-Post: <mailto:dev@tomcat.apache.org>
List-Id: <dev.tomcat.apache.org>
Reply-To: "Tomcat Developers List" <dev@tomcat.apache.org>
Delivered-To: mailing list dev@tomcat.apache.org
Received: (qmail 57320 invoked by uid 99); 23 Aug 2017 17:45:24 -0000
Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 23 Aug 2017 17:45:24 +0000
Received: from svn01-us-west.apache.org (localhost [127.0.0.1])
	by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id EF8CE3A002A
	for <dev@tomcat.apache.org>; Wed, 23 Aug 2017 17:45:22 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1805943 - in /tomcat/native/trunk: native/Makefile.in
 xdocs/miscellaneous/changelog.xml
Date: Wed, 23 Aug 2017 17:45:21 -0000
To: dev@tomcat.apache.org
From: markt@apache.org
X-Mailer: svnmailer-1.0.9
Message-Id: <20170823174522.EF8CE3A002A@svn01-us-west.apache.org>
archived-at: Wed, 23 Aug 2017 17:45:26 -0000

Author: markt
Date: Wed Aug 23 17:45:20 2017
New Revision: 1805943

URL: http://svn.apache.org/viewvc?rev=1805943&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=60290
When building Tomcat Native, don't ignore the value of CC if explicitly set.
Patch provided by Michael Osipov.

Modified:
    tomcat/native/trunk/native/Makefile.in
    tomcat/native/trunk/xdocs/miscellaneous/changelog.xml

Modified: tomcat/native/trunk/native/Makefile.in
URL: http://svn.apache.org/viewvc/tomcat/native/trunk/native/Makefile.in?rev=1805943&r1=1805942&r2=1805943&view=diff
==============================================================================
--- tomcat/native/trunk/native/Makefile.in (original)
+++ tomcat/native/trunk/native/Makefile.in Wed Aug 23 17:45:20 2017
@@ -21,6 +21,7 @@
 
 CFLAGS = @CFLAGS@
 CPPFLAGS = @CPPFLAGS@
+CC_OLD = @CC@
 
 # gets substituted into some targets
 TCNATIVE_MAJOR_VERSION=@TCNATIVE_MAJOR_VERSION@
@@ -47,6 +48,10 @@ TARGETS = $(TARGET_LIB)
 @INCLUDE_RULES@
 @INCLUDE_OUTPUTS@
 
+ifneq ($(CC_OLD),$(CC))
+    CC=$(CC_OLD)
+endif
+
 LINK          = $(LIBTOOL) $(LTFLAGS) --mode=link $(LT_LDFLAGS) $(COMPILE) -version-info $(TCNATIVE_LIBTOOL_VERSION) $(ALL_LDFLAGS) -o $@
 CLEAN_SUBDIRS = test
 

Modified: tomcat/native/trunk/xdocs/miscellaneous/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/native/trunk/xdocs/miscellaneous/changelog.xml?rev=1805943&r1=1805942&r2=1805943&view=diff
==============================================================================
--- tomcat/native/trunk/xdocs/miscellaneous/changelog.xml (original)
+++ tomcat/native/trunk/xdocs/miscellaneous/changelog.xml Wed Aug 23 17:45:20 2017
@@ -61,6 +61,11 @@
       <bug>58434</bug>: Allow Tomcat Native to be compiled with LibreSSL. Note
       that some features may not be available when using LibreSSL. (markt)
     </fix>
+    <fix>
+      <bug>60290</bug>: When building Tomcat Native, don't ignore the value of
+      <code>CC</code> if explicitly set. Patch provided by Michael Osipov.
+      (markt)
+    </fix>
   </changelog>
 </section>
 <section name="Changes in 1.2.12">



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org