aboutsummaryrefslogtreecommitdiff
path: root/Makefile.in
diff options
context:
space:
mode:
authorAndrew Waterman <waterman@eecs.berkeley.edu>2014-01-26 21:48:57 -0800
committerAndrew Waterman <waterman@eecs.berkeley.edu>2014-01-26 21:48:57 -0800
commitec30507bf507ed43263804220b550f8a1a9732ed (patch)
treeadd40a99e2f517b96831e5fc068a59b50811ca82 /Makefile.in
parentfb3be246718190972e8e30688d64632cbb910329 (diff)
downloadspike-ec30507bf507ed43263804220b550f8a1a9732ed.zip
spike-ec30507bf507ed43263804220b550f8a1a9732ed.tar.gz
spike-ec30507bf507ed43263804220b550f8a1a9732ed.tar.bz2
Prefer libraries located in current directory
Diffstat (limited to 'Makefile.in')
-rw-r--r--Makefile.in8
1 files changed, 4 insertions, 4 deletions
diff --git a/Makefile.in b/Makefile.in
index f54864f..1f3074d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -99,7 +99,7 @@ comma := ,
LD := $(CXX)
LDFLAGS := @LDFLAGS@
LIBS := @LIBS@
-LINK := $(LD) $(LDFLAGS) -Wl,-rpath,$(install_libs_dir) $(patsubst -L%,-Wl$(comma)-rpath$(comma)%,$(filter -L%,$(LDFLAGS)))
+LINK := $(LD) -L. $(LDFLAGS) -Wl,-rpath,$(install_libs_dir) $(patsubst -L%,-Wl$(comma)-rpath$(comma)%,$(filter -L%,$(LDFLAGS)))
# Library creation
@@ -205,7 +205,7 @@ $(2)_reverse_deps := $$(call reverse_list,$$($(2)_subproject_deps))
$(2)_lib_libs := $$($(2)_reverse_deps)
$(2)_lib_libnames := $$(patsubst %, lib%.so, $$($(2)_lib_libs))
-$(2)_lib_libarg := -L. $$(patsubst %, -l%, $$($(2)_lib_libs))
+$(2)_lib_libarg := $$(patsubst %, -l%, $$($(2)_lib_libs))
lib$(1).so : $$($(2)_objs) $$($(2)_c_objs) $$($(2)_lib_libnames)
$(LINK) -shared -o $$@ $(if $(filter Darwin,$(shell uname -s)),-install_name $(install_libs_dir)/$$@) $$^ $$($(2)_lib_libarg) $(LIBS)
@@ -220,7 +220,7 @@ $(2)_test_exes := $$(patsubst %.t.cc, %-utst, $$($(2)_test_srcs))
$(2)_test_outs := $$(patsubst %, %.out, $$($(2)_test_exes))
$(2)_test_libs := $(1) $$($(2)_reverse_deps) utst
$(2)_test_libnames := $$(patsubst %, lib%.so, $$($(2)_test_libs))
-$(2)_test_libarg := -L. $$(patsubst %, -l%, $$($(2)_test_libs))
+$(2)_test_libarg := $$(patsubst %, -l%, $$($(2)_test_libs))
$$($(2)_test_objs) : %.o : %.cc
$(COMPILE) -c $$<
@@ -247,7 +247,7 @@ $(2)_prog_deps := $$(patsubst %.o, %.d, $$($(2)_prog_objs))
$(2)_prog_exes := $$(patsubst %.cc, %, $$($(2)_prog_srcs))
$(2)_prog_libs := $(1) $$($(2)_reverse_deps)
$(2)_prog_libnames := $$(patsubst %, lib%.so, $$($(2)_prog_libs))
-$(2)_prog_libarg := -L. $$(patsubst %, -l%, $$($(2)_prog_libs))
+$(2)_prog_libarg := $$(patsubst %, -l%, $$($(2)_prog_libs))
$$($(2)_prog_objs) : %.o : %.cc
$(COMPILE) -c $$<