From 1484855d648b4ed8254139ca9b586666fd3d2e76 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Thu, 13 Feb 2020 03:01:14 +0000 Subject: [PATCH] Replace hard-coded gcc and g++ with __cc and __cxx macros --- nodejs.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/nodejs.spec b/nodejs.spec index 0fc9249..42504a0 100644 --- a/nodejs.spec +++ b/nodejs.spec @@ -8,7 +8,7 @@ # This is used by both the nodejs package and the npm subpackage thar # has a separate version - the name is special so that rpmdev-bumpspec # will bump this rather than adding .1 to the end. -%global baserelease 3 +%global baserelease 4 %{?!_pkgdocdir:%global _pkgdocdir %{_docdir}/%{name}-%{version}} @@ -361,8 +361,8 @@ find . -type f -exec sed -i "s~python -c~python3 -c~" {} \; %global optflags %(echo %{optflags} | sed 's/-g /-g1 /') %endif -export CC='gcc' -export CXX='g++' +export CC='%{__cc}' +export CXX='%{__cxx}' # build with debugging symbols and add defines from libuv (#892601) # Node's v8 breaks with GCC 6 because of incorrect usage of methods on @@ -670,6 +670,9 @@ end %{_pkgdocdir}/npm/docs %changelog +* Tue Mar 17 2020 Tom Stellard - 1:12.16.1-4 +- Replace hard-coded gcc and g++ with __cc and __cxx macros + * Mon Mar 16 2020 Stephen Gallagher - 1:12.16.1-3 - Set npmrc to use python3 explicitly