Skip to content

Commit b9a2996

Browse files
authored
Pass on Fortran compiler and flags to CMake target (#7752)
- This was done for Windows in commit 0f7757d It was missing for Linux. It is only caught now because the nightly builds for some distributions are failing. We specifically need this because we need to allow argument mismatch (-fallow-argument-mismatch) for newer Fortran compilers. - CC, CXX, CFLAGS, ... were passed on to the CMake compiled libraries. Fortran counterparts were missing.
1 parent 198cb18 commit b9a2996

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

OMCompiler/Makefile.in

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,22 +12,23 @@ datadir = @datadir@
1212
datarootdir = @datarootdir@
1313
docdir = @docdir@
1414

15+
AR = @AR@
16+
host = @host@
17+
host_short = @host_short@
18+
FC = @FC@
19+
FCFLAGS = @FCFLAGS@
1520
CMAKE=@CMAKE@
1621
# Use the system's default cmake if nothing is passed to configure script, i.e., no CMAKE=<some_path> is specified
1722
ifeq ($(CMAKE),)
1823
CMAKE=cmake
1924
endif
2025

21-
CMAKE := CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="@LDFLAGS@" $(CMAKE) @CMAKE_EXTRA_DEFINES@
26+
CMAKE := CC="$(CC)" CXX="$(CXX)" FC="$(FC)" CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" FFLAGS="$(FCFLAGS)" LDFLAGS="@LDFLAGS@" $(CMAKE) @CMAKE_EXTRA_DEFINES@
2227
CMAKE_NO_CHECK_UNDEFINED := CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="@CMAKE_LDFLAGS_UNDEFINED_LOOKUP@ @LDFLAGS@" $(CMAKE) @CMAKE_EXTRA_DEFINES@
2328
CMAKE_RPATH := CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="@RPATH_QMAKE@ @CMAKE_LDFLAGS_UNDEFINED_LOOKUP@" $(CMAKE) @CMAKE_EXTRA_DEFINES@
2429
CMAKE_TARGET = "Unix Makefiles"
2530
OPENCL = @OPENCL@
26-
AR = @AR@
27-
host = @host@
28-
host_short = @host_short@
29-
FC = @FC@
30-
FCFLAGS = @FCFLAGS@
31+
3132
ENABLE_PARMODAUTO = @ENABLE_PARMODAUTO@
3233
OMC_TBB_ROOT = @OMC_TBB_ROOT@
3334

0 commit comments

Comments
 (0)