Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
gapou
caffe
Commits
682d9da0
Commit
682d9da0
authored
Feb 20, 2015
by
Evan Shelhamer
Browse files
Merge pull request #1921 from shelhamer/fix-tool-linking
[build] fix dynamic linking of tools
parents
5ee85b79
eabbccd4
Changes
1
Hide whitespace changes
Inline
Side-by-side
Makefile
View file @
682d9da0
...
...
@@ -537,7 +537,12 @@ $(TOOL_BUILD_DIR)/%: $(TOOL_BUILD_DIR)/%.bin | $(TOOL_BUILD_DIR)
@
$(RM)
$@
@
ln
-s
$(
abspath
$<
)
$@
$(TOOL_BINS) $(EXAMPLE_BINS)
:
%.bin : %.o | $(DYNAMIC_NAME)
$(TOOL_BINS)
:
%.bin : %.o | $(DYNAMIC_NAME)
@
echo
CXX/LD
-o
$@
$(Q)$(CXX)
$<
-o
$@
$(LINKFLAGS)
-l
$(PROJECT)
$(LDFLAGS)
\
-Wl
,-rpath,
$(ORIGIN)
/../lib
$(EXAMPLE_BINS)
:
%.bin : %.o | $(DYNAMIC_NAME)
@
echo
CXX/LD
-o
$@
$(Q)$(CXX)
$<
-o
$@
$(LINKFLAGS)
-l
$(PROJECT)
$(LDFLAGS)
\
-Wl
,-rpath,
$(ORIGIN)
/../../lib
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment