summaryrefslogtreecommitdiff
path: root/ACE/bin/MakeProjectCreator/templates
diff options
context:
space:
mode:
authormitza <mitza@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2010-12-27 20:36:01 +0000
committermitza <mitza@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2010-12-27 20:36:01 +0000
commit99df926865d4a438c85fd283fffba70ac6ca41a1 (patch)
treeac4cfc27061126ab45b2078beeb26805d0f0e2a2 /ACE/bin/MakeProjectCreator/templates
parentaa2c72be06630059b48cef3b69920aa26dd0a70b (diff)
downloadATCD-99df926865d4a438c85fd283fffba70ac6ca41a1.tar.gz
ChangeLogTag: Mon Dec 27 20:32:33 UTC 2010 Adam Mitz <mitza@ociweb.com>
Diffstat (limited to 'ACE/bin/MakeProjectCreator/templates')
-rw-r--r--ACE/bin/MakeProjectCreator/templates/gnu.mpd4
1 files changed, 2 insertions, 2 deletions
diff --git a/ACE/bin/MakeProjectCreator/templates/gnu.mpd b/ACE/bin/MakeProjectCreator/templates/gnu.mpd
index d2bcbab78bc..00203ac0b15 100644
--- a/ACE/bin/MakeProjectCreator/templates/gnu.mpd
+++ b/ACE/bin/MakeProjectCreator/templates/gnu.mpd
@@ -678,7 +678,7 @@ ifneq ($(VXWORKSLINK),1)
<%if(libs && libpaths)%>
ifeq ($(static_libs_only), 1)
ifeq ($(use_dep_libs), 1)
- DEPLIBS = $(foreach lib,<%foreach(libs)%> <%libname_prefix%><%lib%><%endfor%> <%lit_libs%>, $(foreach libpath,<%foreach(libpaths)%><%if(targetoutdir)%> <%libpath%>/<%targetoutdir%><%endif%> <%libpath%><%endfor%>, $(wildcard $(libpath)/lib$(lib).a)))
+ DEPLIBS = $(foreach lib,<%foreach(libs)%> <%libname_prefix%><%lib%><%endfor%> <%lit_libs%>, $(foreach libpath,<%foreach(libpaths)%><%if(targetoutdir)%> <%libpath%>/<%targetoutdir%><%endif%> <%libpath%><%endfor%>, $(wildcard $(libpath)/$(LIB_PREFIX)$(lib).$(LIBEXT))))
endif
endif
@@ -738,7 +738,7 @@ install: <%if(postbuild)%>__postbuild__<%else%>all<%endif%>
INSTALL_LIB ?= lib
ifneq ($(INSTALL_PREFIX),)
ifneq ($(install_rpath),0)
-LDFLAGS += -Wl,-R$(INSTALL_PREFIX)/$(INSTALL_LIB)
+LDFLAGS += -Wl,-R$(INSTALL_PREFIX)/$(INSTALL_LIB) $(LD_RPATH_FLAGS)
endif
endif