diff --git a/CHANGELOG.md b/CHANGELOG.md index c98a45f9fcddbf204a63fd517cecdcfa4f99865f..a5a213ca6f3c81bab0e287e89fc826472b498604 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # FSL base project changelog +## 2111.9 (Wednesday 8th December 2021) + +* If the `${LDFLAGS}` environment variable is set in the environment, any + `-L` options are dropped from it, so that the `$FSLDEVDIR` can explicitly + be set to take precedence over `$FSLDIR`. + + ## 2111.8 (Friday 26th November 2021) * Work around an issue with compiling against older versions of `libxml++`, diff --git a/config/buildSettings.mk b/config/buildSettings.mk index 2bff6c1f6cfbf894ddd43e1d67fa7a0f3cc0c6f8..5257812a9744a36427e764c55105dc59ffd02add 100644 --- a/config/buildSettings.mk +++ b/config/buildSettings.mk @@ -98,6 +98,13 @@ COMMA := , _LDFLAGS := $(patsubst -Wl${COMMA}-rpath%,,${LDFLAGS}) LDFLAGS = ${_LDFLAGS} +# Also drop -L options from LDFLAGS if set in the +# environment, as we want to set our own +# precedence rules as above ($FSLDEVDIR > $FSLDIR) +# - this is done in vars.mk +_LDFLAGS := $(patsubst -L%,,${_LDFLAGS}) +LDFLAGS = ${_LDFLAGS} + ifeq ($(SYSTYPE), Darwin) # CC, CXX, CFLAGS, CXXFLAGS, and LDFLAGS