projects
/
platform
/
upstream
/
caffe.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
07ba3fd
)
don't pass LDFLAGS when only compiling
author
Jonathan L Long
<jonlong@cs.berkeley.edu>
Mon, 26 May 2014 08:34:32 +0000
(
01:34
-0700)
committer
Jonathan L Long
<jonlong@cs.berkeley.edu>
Mon, 26 May 2014 08:34:32 +0000
(
01:34
-0700)
Makefile
patch
|
blob
|
history
diff --git
a/Makefile
b/Makefile
index
3863fbf
..
a092ac8
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-341,12
+341,12
@@
$(UTIL_BUILD_DIR)/%.cuo: src/$(PROJECT)/util/%.cu | $(UTIL_BUILD_DIR)
@ echo
$(TOOL_BUILD_DIR)/%.o: tools/%.cpp $(PROTO_GEN_HEADER) | $(TOOL_BUILD_DIR)
- $(CXX) $< $(CXXFLAGS) -c -o $@
$(LDFLAGS)
+ $(CXX) $< $(CXXFLAGS) -c -o $@
@ echo
$(EXAMPLE_BUILD_DIR)/%.o: examples/%.cpp $(PROTO_GEN_HEADER) \
| $(EXAMPLE_BUILD_DIRS)
- $(CXX) $< $(CXXFLAGS) -c -o $@
$(LDFLAGS)
+ $(CXX) $< $(CXXFLAGS) -c -o $@
@ echo
$(BUILD_DIR)/src/$(PROJECT)/%.o: src/$(PROJECT)/%.cpp $(HXX_SRCS)