Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
F
faiss
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
钟尚武
faiss
Commits
dd6c9ebf
Commit
dd6c9ebf
authored
Jun 13, 2018
by
Eduardo Pinho
Committed by
Lucas Hosseini
Jun 13, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[c_api] Rearrange lib linking in Makefiles (#490)
parent
f841bbab
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
Makefile
c_api/Makefile
+2
-2
Makefile
c_api/gpu/Makefile
+2
-2
No files found.
c_api/Makefile
View file @
dd6c9ebf
...
...
@@ -26,8 +26,8 @@ $(CLIBNAME).a: $(LIBCOBJ)
# Build dynamic library (independent object)
$(CLIBNAME).$(SHAREDEXT)
:
$(LIBCOBJ) ../$(LIBNAME).a
$(CXX)
$(LDFLAGS)
$(
LIBS)
$(
SHAREDFLAGS)
-o
$@
\
-Wl
,--whole-archive
$^
-Wl
,--no-whole-archive
-static-libstdc
++
$(CXX)
$(LDFLAGS)
$(SHAREDFLAGS)
-o
$@
\
-Wl
,--whole-archive
$^
-Wl
,--no-whole-archive
$(LIBS)
-static-libstdc
++
bin/example_c
:
example_c.c $(CLIBNAME).$(SHAREDEXT)
$(CC)
$(CFLAGS)
-std
=
c99
-I
.
-I
..
-L
.
-o
$@
example_c.c
\
...
...
c_api/gpu/Makefile
View file @
dd6c9ebf
...
...
@@ -28,9 +28,9 @@ $(CLIBNAME).a: $(LIBGPUCOBJ) ../../gpu/$(LIBNAME).a
# Build dynamic library
$(CLIBNAME).$(SHAREDEXT)
:
$(LIBCOBJ) $(LIBGPUCOBJ) ../../libfaiss.a ../../gpu/$(LIBNAME).a
$(CXX)
$(LDFLAGS)
$(SHAREDFLAGS)
$(CUDACFLAGS)
$(LIBS)
-o
$@
\
$(CXX)
$(LDFLAGS)
$(SHAREDFLAGS)
$(CUDACFLAGS)
-o
$@
\
-Wl
,--whole-archive
$(LIBCOBJ)
../../libfaiss.a
\
-Wl
,--no-whole-archive
-static-libstdc
++
$(LIBGPUCOBJ)
../../gpu/
$(LIBNAME)
.a
\
-Wl
,--no-whole-archive
-static-libstdc
++
$(LIBGPUCOBJ)
$(LIBS)
../../gpu/
$(LIBNAME)
.a
\
$(NVCCLDFLAGS)
$(NVCCLIBS)
# Build GPU example
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a 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