Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
B
base
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
FSL
base
Commits
adcd16c3
Commit
adcd16c3
authored
3 years ago
by
Paul McCarthy
Browse files
Options
Downloads
Patches
Plain Diff
RF: Also need to drop -L flags that are set in environment, in addition
to -rpath flags
parent
922488e0
No related branches found
No related tags found
1 merge request
!37
RF: Also need to drop -L flags that are set in environment, in addition to -rpath flags
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
config/buildSettings.mk
+7
-0
7 additions, 0 deletions
config/buildSettings.mk
with
7 additions
and
0 deletions
config/buildSettings.mk
+
7
−
0
View file @
adcd16c3
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment