diff options
| author | David Tardon <dtardon@redhat.com> | 2015-06-05 14:44:52 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2015-06-05 14:50:03 +0200 |
| commit | 9516798af0cfb0d36654f636cf8752f1c313e74b (patch) | |
| tree | 2b064227a09e8f9d2134978eef7f12d7ddfced92 /external | |
| parent | 05c1a94a5485a68ffc1d1f6de6919b00995dc800 (diff) | |
use $(DISABLE_DYNLOADING)
Change-Id: I0997be4c4ae92f697b19b162674efcb8278eaf3a
Diffstat (limited to 'external')
| -rw-r--r-- | external/firebird/ExternalPackage_firebird.mk | 2 | ||||
| -rw-r--r-- | external/firebird/ExternalProject_firebird.mk | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/external/firebird/ExternalPackage_firebird.mk b/external/firebird/ExternalPackage_firebird.mk index 59b938bbcc4c..98917f8ae0a1 100644 --- a/external/firebird/ExternalPackage_firebird.mk +++ b/external/firebird/ExternalPackage_firebird.mk @@ -15,7 +15,7 @@ ifeq ($(OS)-$(COM),WNT-MSC) $(eval $(call gb_ExternalPackage_add_file,firebird,$(LIBO_LIB_FOLDER)/ifbembed.dll,gen/firebird/bin/ifbembed.dll)) else ifeq ($(OS),MACOSX) $(eval $(call gb_ExternalPackage_add_file,firebird,$(LIBO_LIB_FOLDER)/libfbembed.dylib,gen/firebird/lib/libfbembed.dylib.2.5.2)) -else +else ifeq ($(DISABLE_DYNLOADING),) $(eval $(call gb_ExternalPackage_add_file,firebird,$(LIBO_LIB_FOLDER)/libfbembed.so.2.5,gen/firebird/lib/libfbembed.so.2.5.2)) endif diff --git a/external/firebird/ExternalProject_firebird.mk b/external/firebird/ExternalProject_firebird.mk index ed802c3de85a..d2607f0e3ca2 100644 --- a/external/firebird/ExternalProject_firebird.mk +++ b/external/firebird/ExternalProject_firebird.mk @@ -52,7 +52,11 @@ $(call gb_ExternalProject_get_state_target,firebird,build): --with-system-icu --without-fbsample --without-fbsample-db \ $(if $(ENABLE_DEBUG),--enable-debug) \ $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ - $(if $(filter IOS ANDROID,$(OS)),--disable-shared,--disable-static) \ + $(if $(DISABLE_DYNLOADING), \ + --enable-static --disable-shared \ + , \ + --enable-shared --disable-static \ + ) \ && $(if $(filter WNT,$(OS)),\ PATH="$(shell cygpath -u $(call gb_UnpackedTarball_get_dir,icu)/source/lib):$$PATH",\ $(gb_Helper_set_ld_path)) \ |