floraachy
/
OpenBLAS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rewrite NOFORTRAN conditionals 

... so that they do not trigger accidentally when NOFORTRAN is empty/unset
This commit is contained in:
Martin Kroeker 2017-09-25 23:45:14 +02:00 committed by GitHub
parent 3a245a376f
commit 79e754e548
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
exports/Makefile
View File

@ -51,7 +51,7 @@ endif
endif endif
endif endif
ifeq ($(NOFORTRAN), $(filter $(NOFORTRAN),1 2)) ifneq (,$(filter 1 2,$(NOFORTRAN)))
FEXTRALIB = FEXTRALIB =
endif endif
@ -112,7 +112,7 @@ else
$(OBJCONV) @objconv.def ../$(LIBNAME) ../$(LIBNAME).osx.renamed $(OBJCONV) @objconv.def ../$(LIBNAME) ../$(LIBNAME).osx.renamed
$(LIBDYNNAME) : ../$(LIBNAME).osx.renamed osx.def $(LIBDYNNAME) : ../$(LIBNAME).osx.renamed osx.def
endif endif
ifeq ($(NOFORTRAN), $(filter $(NOFORTRAN),1 2)) ifneq (,$(filter 1 2,$(NOFORTRAN)))
#only build without Fortran #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) $(CC) $(CFLAGS) -all_load -headerpad_max_install_names -install_name "$(CURDIR)/../$(LIBDYNNAME)" -dynamiclib -o ../$(LIBDYNNAME) $< -Wl,-exported_symbols_list,osx.def $(FEXTRALIB)
else else