From 79e754e5483986170f66127bb874bb3060d18ca8 Mon Sep 17 00:00:00 2001 From: Martin Kroeker Date: Mon, 25 Sep 2017 23:45:14 +0200 Subject: [PATCH] Rewrite NOFORTRAN conditionals ... so that they do not trigger accidentally when NOFORTRAN is empty/unset --- exports/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/exports/Makefile b/exports/Makefile index 873adc3..4005ab0 100644 --- a/exports/Makefile +++ b/exports/Makefile @@ -51,7 +51,7 @@ endif endif endif -ifeq ($(NOFORTRAN), $(filter $(NOFORTRAN),1 2)) +ifneq (,$(filter 1 2,$(NOFORTRAN))) FEXTRALIB = endif @@ -112,7 +112,7 @@ else $(OBJCONV) @objconv.def ../$(LIBNAME) ../$(LIBNAME).osx.renamed $(LIBDYNNAME) : ../$(LIBNAME).osx.renamed osx.def endif -ifeq ($(NOFORTRAN), $(filter $(NOFORTRAN),1 2)) +ifneq (,$(filter 1 2,$(NOFORTRAN))) #only build without Fortran $(CC) $(CFLAGS) -all_load -headerpad_max_install_names -install_name "$(CURDIR)/../$(LIBDYNNAME)" -dynamiclib -o ../$(LIBDYNNAME) $< -Wl,-exported_symbols_list,osx.def $(FEXTRALIB) else -- 2.7.4