Skip to content
Snippets Groups Projects
Commit 291d7e0c authored by Paul McCarthy's avatar Paul McCarthy :mountain_bicyclist:
Browse files

Merge branch 'rf/install_name' into 'master'

RF: Better way of adding -install_name option

See merge request !28
parents 9592a38f d33a508f
No related branches found
Tags 2111.1
1 merge request!28RF: Better way of adding -install_name option
Pipeline #11465 passed
# 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)
......
......@@ -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
#####################################################################
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment