diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2016-05-10 10:33:24 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2016-05-10 10:33:24 +0200 |
| commit | b53b13e72df1c85b31717cba02fab1175aef19a3 (patch) | |
| tree | 8993521af0cff262c2952f542cee86da6f32d31d | |
| parent | Made mksoname optional (diff) | |
| download | ice-b53b13e72df1c85b31717cba02fab1175aef19a3.tar.bz2 ice-b53b13e72df1c85b31717cba02fab1175aef19a3.tar.xz ice-b53b13e72df1c85b31717cba02fab1175aef19a3.zip | |
Potential fix for MCPP_HOME failure with Travis
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | config/Make.rules | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index 4b83dc7ec51..d4293a3ccdc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -51,7 +51,7 @@ install: - CPPFLAGS=-fPIC make -C ${LMDB_BUILD_DIR}/libraries/liblmdb install prefix=${LMDB_HOME} - rm -f ${LMDB_HOME}/lib/liblmdb.so - pip install --user passlib -- make -C ${WORK_DIR} -j3 +- make -C ${WORK_DIR} -j3 V=1 script: - cd ${WORK_DIR} diff --git a/config/Make.rules b/config/Make.rules index b25ed456616..ea2f82824de 100644 --- a/config/Make.rules +++ b/config/Make.rules @@ -130,8 +130,8 @@ lmdb_home := $(LMDB_HOME) define make-thirdparty ifneq ($($1_home),) # Check for 3rd party libraries either in home/lib<platform specific subdir> or home/lib -$1_libdir ?= $$(if $$(wildcard $$($1_home)/lib$$(call platform-var,installdir,$$1,$$2,$$3)),\ - $$($1_home)/lib$$(call platform-var,installdir,$$1,$$2,$$3),$$($1_home)/lib) +$1_libdir ?= $$(strip $$(if $$(wildcard $$($1_home)/lib$$(call platform-var,installdir,$$1,$$2,$$3)),\ + $$($1_home)/lib$$(call platform-var,installdir,$$1,$$2,$$3),$$($1_home)/lib)) $1_includedir ?= $$($1_home)/include endif $1_ldflags ?= -l$1 |