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

Merge branch 'rf/ldflags' into 'master'

RF: Also need to drop -L flags that are set in environment, in addition to -rpath flags

See merge request !37
parents 922488e0 b166bc53
No related branches found
No related tags found
1 merge request!37RF: Also need to drop -L flags that are set in environment, in addition to -rpath flags
Pipeline #12282 passed
# 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++`,
......
......@@ -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
......
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