diff --git a/CHANGELOG.md b/CHANGELOG.md index 2a8f79c1179bd105dca256118325855e90de25a0..f5f7bdf68131527a413b0f66ce6fda01ab4f8e61 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,11 +1,17 @@ # FSL base project changelog + +## 2111.1 (Fridat 12th November 2021) + + - Tweak to how the `-install_name` option is set. + + ## 2111.0 (Thursday 11th November 2021) - - The `rpath` is explicitly set on executables and shared libraries, - and the `install_name` set on shared libraries under macOS. This - is to support local development, and execution of commands from - their `$FSLDIR/src/` directory. + - The `-rpath` is explicitly set on executables and shared libraries, and the + `-install_name` set on shared libraries under macOS. This is to support + local development, and execution of commands from their `$FSLDIR/src/` + directory. ## 2109.1 (Wednesday 22nd September 2021) diff --git a/config/buildSettings.mk b/config/buildSettings.mk index 885008126d2c6455acfbc7cab933a03cf8faaf86..8ce6319b596b36e26467c67b96db86022315af83 100644 --- a/config/buildSettings.mk +++ b/config/buildSettings.mk @@ -112,9 +112,7 @@ ifeq ($(SYSTYPE), Darwin) # that we give shared libs a suffix of # .so (not .dylib) on both linux and # macOS. - ifeq ($(patsubst %.so,,$@),) - LDFLAGS += -Wl,-install_name,@rpath/$@ - endif + %.so : LDFLAGS += -Wl,-install_name,@rpath/$@ endif #####################################################################