#3 Rework build flags (FTBFS bz#2045202)
Closed 2 years ago by ankursinha. Opened 2 years ago by orion.
rpms/ orion/arbor ftbfs  into  rawhide

file modified
+2 -8
@@ -237,8 +237,6 @@ 

  }

  

  # 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 @@ 

  # 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 @@ 

  # 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 MPI_YES=ON

  # Python 3

  export MPI_COMPILE_TYPE="-openmpi"

+ %set_build_flags

  %{do_cmake_config}

  %{do_make_build}

  

Not yet fully tested - hopefully the test build succeeds.

Thanks @orion . I think this needs more work---I'm working on updating to a new release which should hopefully fix some stuff.

About the change here: I thought we had to override the compiler variables after some change in the macros to ensure that the correct MPI compilers were being used? (I can't remember what change this was exactly, unfortunately)

Pull-Request has been closed by ankursinha

2 years ago
Metadata