From e9bcc973550937a1dea3eb3d3133b12b5c086fd4 Mon Sep 17 00:00:00 2001 From: Martin Beaudoin Date: Thu, 11 Jul 2019 17:05:45 -0400 Subject: [PATCH] ThirdParty: minor adjustments under macOS 10.14.5 for the compilation of ParMGridGen-1.0 and metis-5.1.0. The environment variable $CC has to be written between double-quotes when using it as a make command-line parameter for CC. --- ThirdParty/rpmBuild/SPECS/ParMGridGen-1.0.spec | 2 +- ThirdParty/rpmBuild/SPECS/metis-5.1.0.spec | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ThirdParty/rpmBuild/SPECS/ParMGridGen-1.0.spec b/ThirdParty/rpmBuild/SPECS/ParMGridGen-1.0.spec index d52fc4073..3d378cac5 100644 --- a/ThirdParty/rpmBuild/SPECS/ParMGridGen-1.0.spec +++ b/ThirdParty/rpmBuild/SPECS/ParMGridGen-1.0.spec @@ -106,7 +106,7 @@ fi [ -n "$WM_LDFLAGS" ] && export LDFLAGS="$WM_LDFLAGS" [ -z "$WM_NCOMPPROCS" ] && WM_NCOMPPROCS=1 - make -j $WM_NCOMPPROCS CC=$CC + make -j $WM_NCOMPPROCS CC="$WM_CC" %install # Manual installation diff --git a/ThirdParty/rpmBuild/SPECS/metis-5.1.0.spec b/ThirdParty/rpmBuild/SPECS/metis-5.1.0.spec index f115d27ba..88ee4c8ca 100644 --- a/ThirdParty/rpmBuild/SPECS/metis-5.1.0.spec +++ b/ThirdParty/rpmBuild/SPECS/metis-5.1.0.spec @@ -109,10 +109,10 @@ fi %ifos darwin make config # The parameter -D_POSIX_C_SOURCE=200809 has a side effect on Mac OS X - make -j $WM_NCOMPPROCS OPTFLAGS="-O3 -fPIC" CC=$CC + make -j $WM_NCOMPPROCS OPTFLAGS="-O3 -fPIC" CC="$CC" %else make config - make -j $WM_NCOMPPROCS OPTFLAGS="-O3 -fPIC -D_POSIX_C_SOURCE=200809" CC=$CC + make -j $WM_NCOMPPROCS OPTFLAGS="-O3 -fPIC -D_POSIX_C_SOURCE=200809" CC="$CC" %endif %install