diff options
| author | William R. Otte <wotte@dre.vanderbilt.edu> | 2014-07-27 15:46:43 +0000 |
|---|---|---|
| committer | William R. Otte <wotte@dre.vanderbilt.edu> | 2014-07-27 15:46:43 +0000 |
| commit | adc98cee09694cd96d5561fc1be0d23cf9de2c2b (patch) | |
| tree | 6a17ace21fb4df79f3ad353fd4880b604dd48989 /ACE/bin | |
| parent | 900eec9dd777132b3048773f4a9a846c4bae8c82 (diff) | |
| download | ATCD-adc98cee09694cd96d5561fc1be0d23cf9de2c2b.tar.gz | |
Sun Jul 27 15:39:21 UTC 2014 William R. Otte <wotte@dre.vanderbilt.edu>
* bin/MakeProjectCreator/templates/gnu.mpd:
If we are building ACE/TAO/CIAO/whatever for a target other than
the build host, we certainly shouln't be looking in the host
library directories to verify the existance of a library
for the purposes of the LIBCHECK step.
This introduces two new variables that a user may optionally
set to control where we look: LIBCHECK_PREFIX, onto which we
append /lib and /lib64 (e.g., $(LIBCHECK_PREFIX)/lib), which
defaults to /usr; LIBCHECK_EXTRA_PATHS, which allows the
user to specify extra places to look when we are seeking
to confirm the existance of libraries.
Diffstat (limited to 'ACE/bin')
| -rw-r--r-- | ACE/bin/MakeProjectCreator/templates/gnu.mpd | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/ACE/bin/MakeProjectCreator/templates/gnu.mpd b/ACE/bin/MakeProjectCreator/templates/gnu.mpd index b7705739f29..7b95f3f40df 100644 --- a/ACE/bin/MakeProjectCreator/templates/gnu.mpd +++ b/ACE/bin/MakeProjectCreator/templates/gnu.mpd @@ -263,7 +263,12 @@ else ifeq ($(findstring k, $(MAKEFLAGS)),k) LIBCHECK = 1 else - LIBCHECK ?= $(filter-out $(foreach lib,<%foreach(libs)%><%libname_prefix%><%lib%><%fornotlast(" ")%><%endfor%>,$(findstring $(lib),$(foreach libpath,<%foreach(libpaths)%><%if(targetoutdir)%><%libpath%>/<%targetoutdir%> <%endif%><%libpath%> $(if $(ARCH),<%libpath%>/$(ARCH)) <%endfor%>/usr/lib /usr/lib64 $(INSLIB),$(wildcard $(libpath)/$(LIB_PREFIX)$(lib).* $(libpath)/$(lib).lib)))),<%foreach(libs)%><%libname_prefix%><%lib%><%fornotlast(" ")%><%endfor%>) + ifeq ($(LIBCHECK_PREFIX),) + # If the user hasn't specified a place to look for installed libraries, let's set + # a reasonable default + LIBCHECK_PREFIX = /usr + endif + LIBCHECK ?= $(filter-out $(foreach lib,<%foreach(libs)%><%libname_prefix%><%lib%><%fornotlast(" ")%><%endfor%>,$(findstring $(lib),$(foreach libpath,<%foreach(libpaths)%><%if(targetoutdir)%><%libpath%>/<%targetoutdir%> <%endif%><%libpath%> $(if $(ARCH),<%libpath%>/$(ARCH)) <%endfor%>$(LIBCHECK_PREFIX)/lib $(LIBCHECK_PREFIX)/lib64 $(LIBCHECK_EXTRA_PATHS) $(INSLIB),$(wildcard $(libpath)/$(LIB_PREFIX)$(lib).* $(libpath)/$(lib).lib)))),<%foreach(libs)%><%libname_prefix%><%lib%><%fornotlast(" ")%><%endfor%>) ifeq ($(LIBCHECK),) LIBCHECK = 1 endif |