From 9622eab9c2b34053e42ff1ca222c319c52d2b593 Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@nwra.com>
Date: Apr 23 2022 04:45:04 +0000
Subject: Rework build flags (FTBFS bz#2045202)


---

diff --git a/arbor.spec b/arbor.spec
index f5bcd85..63e17ad 100644
--- a/arbor.spec
+++ b/arbor.spec
@@ -237,8 +237,6 @@ popd || exit -1;
 }
 
 # Build serial version, dummy arguments
-%global __cc gcc
-%global __cxx g++
 %set_build_flags
 export MPI_SUFFIX=""
 export MPI_HOME=%{_prefix}
@@ -259,15 +257,13 @@ rm -rfv html/{.buildinfo,.doctrees}
 # Build mpich version
 %if %{with mpich}
 %{_mpich_load}
-%global __cc mpicc
-%global __cxx mpicxx
-%set_build_flags
 export CC=mpicc
 export CXX=mpicxx
 export FC=mpif90
 export F77=mpif77
 export MPI_YES=ON
 export MPI_COMPILE_TYPE="-mpich"
+%set_build_flags
 %{do_cmake_config}
 %{do_make_build}
 
@@ -277,9 +273,6 @@ export MPI_COMPILE_TYPE="-mpich"
 # Build OpenMPI version
 %if %{with openmpi}
 %{_openmpi_load}
-%global __cc mpicc
-%global __cxx mpicxx
-%set_build_flags
 export CC=mpicc
 export CXX=mpicxx
 export FC=mpif90
@@ -287,6 +280,7 @@ export F77=mpif77
 export MPI_YES=ON
 # Python 3
 export MPI_COMPILE_TYPE="-openmpi"
+%set_build_flags
 %{do_cmake_config}
 %{do_make_build}