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-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
