Mercurial > mxe-octave
comparison src/of-ltfat-2-LDFLAGS.patch @ 5988:9c2862093788
of-ltfat: Also set LDFLAGS (bug #61576).
* src/of-ltfat-2-LDFLAGS.patch: Also set LDFLAGS (to the same value as LFLAGS).
* dist-files.mk: Add new file to dist.
| author | Markus Mützel <markus.muetzel@gmx.de> |
|---|---|
| date | Sun, 28 Nov 2021 20:32:24 +0100 |
| parents | |
| children | 233137818bb1 |
comparison
equal
deleted
inserted
replaced
| 5987:3be68b84098a | 5988:9c2862093788 |
|---|---|
| 1 From a4a28fae940e37db61b598ed0ed887f358fbfe1f Mon Sep 17 00:00:00 2001 | |
| 2 From: =?UTF-8?q?Markus=20M=C3=BCtzel?= <markus.muetzel@gmx.de> | |
| 3 Date: Sun, 28 Nov 2021 20:04:06 +0100 | |
| 4 Subject: [PATCH] Use LDFLAGS instead of LFLAGS (bug #61576). | |
| 5 | |
| 6 * oct/Makefile_unix: Use LDFLAGS instead of LFLAGS. The latter was misnamed and | |
| 7 removed in Octave 8. Keep setting LFLAGS for older versions of Octave (prior | |
| 8 to version 7). | |
| 9 --- | |
| 10 oct/Makefile_unix | 6 ++++-- | |
| 11 1 file changed, 4 insertions(+), 2 deletions(-) | |
| 12 | |
| 13 diff --git a/oct/Makefile_unix b/oct/Makefile_unix | |
| 14 index 8f497297..20edbbc3 100644 | |
| 15 --- a/oct/Makefile_unix | |
| 16 +++ b/oct/Makefile_unix | |
| 17 @@ -34,9 +34,11 @@ FFTW_LIBS := $(shell $(MKOCTFILE) -p FFTW_LIBS) | |
| 18 endif | |
| 19 | |
| 20 export CXXFLAGS := $(shell $(MKOCTFILE) -p CXXFLAGS) -std=gnu++11 -Wall -DLTFAT_LARGEARRAYS $(OPTCXXFLAGS) | |
| 21 -# export is necessary, otherwise LFLAGS won't have any effect | |
| 22 +# export is necessary, otherwise LDFLAGS won't have any effect | |
| 23 # at least on Windows and on Mac | |
| 24 -export LFLAGS := $(shell $(MKOCTFILE) -p LFLAGS) $(FLIBS) $(LAPACK_LIBS) $(BLAS_LIBS) $(FFTW_LIBS) | |
| 25 +export LDFLAGS := $(shell $(MKOCTFILE) -p LDFLAGS) $(FLIBS) $(LAPACK_LIBS) $(BLAS_LIBS) $(FFTW_LIBS) | |
| 26 +# also export as LFLAGS for Octave prior to version 7 | |
| 27 +export LFLAGS := $(shell $(MKOCTFILE) -p LFLAGS) $(FLIBS) $(LAPACK_LIBS) $(BLAS_LIBS) $(FFTW_LIBS) | |
| 28 | |
| 29 MKOCTFILEFLAGS = -I../libltfat/modules/libltfat/include -DNDEBUG -L../lib -lltfat | |
| 30 | |
| 31 -- | |
| 32 2.34.1.windows.1 | |
| 33 |