diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2011-11-15 09:02:41 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2011-11-15 09:04:37 +0100 |
| commit | 450c49d93ffe9b49e643ade30a650105b9e5701c (patch) | |
| tree | ab7447d660ecf8476522a158ffa6680554b6e655 /solenv | |
| parent | 964671497e0b384f6db34c5b7a5d73e26157a47c (diff) | |
add sqlite path to library path and enable testPassword
plus gb_Helper_extend_ld_path normalization by sbergman@redhat.com
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/platform/com_GCC_defs.mk | 5 | ||||
| -rw-r--r-- | solenv/gbuild/platform/macosx.mk | 3 | ||||
| -rw-r--r-- | solenv/gbuild/platform/solaris.mk | 8 | ||||
| -rw-r--r-- | solenv/gbuild/platform/unxgcc.mk | 3 |
4 files changed, 16 insertions, 3 deletions
diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk index c73219eabad7..f91b58e30d5b 100644 --- a/solenv/gbuild/platform/com_GCC_defs.mk +++ b/solenv/gbuild/platform/com_GCC_defs.mk @@ -117,6 +117,11 @@ endif gb_Helper_set_ld_path := $(gb_Helper_LIBRARY_PATH_VAR)=$(OUTDIR_FOR_BUILD)/lib +# $(1): list of directory pathnames to append at the end of the ld path +define gb_Helper_extend_ld_path +$(gb_Helper_set_ld_path)$(foreach dir,$(1),:$(dir)) +endef + # convert parameters filesystem root to native notation # does some real work only on windows, make sure not to diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk index 7fa338a0e7d4..9d70d0b4c076 100644 --- a/solenv/gbuild/platform/macosx.mk +++ b/solenv/gbuild/platform/macosx.mk @@ -363,7 +363,8 @@ endef # CppunitTest class -gb_CppunitTest_CPPTESTPRECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib +gb_CppunitTest_CPPTESTPRECOMMAND := \ + $(call gb_Helper_extend_ld_path,$(OUTDIR_FOR_BUILD)/lib/sqlite) gb_CppunitTest_SYSPRE := libtest_ gb_CppunitTest_EXT := .dylib gb_CppunitTest_LIBDIR := $(gb_Helper_OUTDIRLIBDIR) diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk index 711216a6eccd..28dbba8c8517 100644 --- a/solenv/gbuild/platform/solaris.mk +++ b/solenv/gbuild/platform/solaris.mk @@ -137,6 +137,11 @@ gb_Helper_abbreviate_dirs_native = $(gb_Helper_abbreviate_dirs) gb_Helper_set_ld_path := LD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib +# $(1): list of directory pathnames to append at the end of the ld path +define gb_Helper_extend_ld_path +$(gb_Helper_set_ld_path)$(foreach dir,$(1),:$(dir)) +endef + # convert parameters filesystem root to native notation # does some real work only on windows, make sure not to # break the dummy implementations on unx* @@ -342,7 +347,8 @@ endef # CppunitTest class -gb_CppunitTest_CPPTESTPRECOMMAND := $(gb_Helper_set_ld_path) +gb_CppunitTest_CPPTESTPRECOMMAND := \ + $(call gb_Helper_extend_ld_path,$(OUTDIR_FOR_BUILD)/lib/sqlite) gb_CppunitTest_SYSPRE := libtest_ gb_CppunitTest_EXT := .so gb_CppunitTest_LIBDIR := $(gb_Helper_OUTDIRLIBDIR) diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk index a96f90a977b9..7df93f02151f 100644 --- a/solenv/gbuild/platform/unxgcc.mk +++ b/solenv/gbuild/platform/unxgcc.mk @@ -362,7 +362,8 @@ endef # CppunitTest class -gb_CppunitTest_CPPTESTPRECOMMAND := $(gb_Helper_set_ld_path) +gb_CppunitTest_CPPTESTPRECOMMAND := \ + $(call gb_Helper_extend_ld_path,$(OUTDIR_FOR_BUILD)/lib/sqlite) gb_CppunitTest_SYSPRE := libtest_ gb_CppunitTest_EXT := .so gb_CppunitTest_LIBDIR := $(gb_Helper_OUTDIRLIBDIR) |