diff options
author | Tor Lillqvist <tml@iki.fi> | 2012-02-27 10:03:18 +0200 |
---|---|---|
committer | Tor Lillqvist <tml@iki.fi> | 2012-02-27 10:06:22 +0200 |
commit | 4c737b647078f35a2435e27d9f7f94039db9d6c3 (patch) | |
tree | 7a7699dea8d63b72ac7f248ec026e47be9d3c8ee /solenv | |
parent | aSfxInt16Item_Impl, too (diff) | |
download | core-4c737b647078f35a2435e27d9f7f94039db9d6c3.tar.gz core-4c737b647078f35a2435e27d9f7f94039db9d6c3.zip |
Decouple disabling of scripting (BASIC &co) from OS being iOS
Diffstat (limited to 'solenv')
-rw-r--r-- | solenv/gbuild/CppunitTest.mk | 2 | ||||
-rw-r--r-- | solenv/gbuild/gbuild.mk | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk index 2f7447fe06bc..30f1021a9016 100644 --- a/solenv/gbuild/CppunitTest.mk +++ b/solenv/gbuild/CppunitTest.mk @@ -182,7 +182,7 @@ endef # to libraries not built in this configuration. define gb_CppunitTest__filter_not_built_components $(filter-out \ - $(if $(filter $(OS),IOS), \ + $(if $(filter INTERPRETERS,$(BUILD_TYPE)),, \ basic/util/sb \ sw/util/vbaswobj \ scripting/source/basprov/basprov \ diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index 3eeff9143f87..b35d73a98e13 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -236,6 +236,10 @@ ifeq ($(strip $(DISABLE_DBCONNECTIVITY)),TRUE) gb_GLOBALDEFS += -DDISABLE_DBCONNECTIVITY endif +ifeq ($(strip $(DISABLE_INTERPRETERS)),TRUE) +gb_GLOBALDEFS += -DDISABLE_INTERPRETERS +endif + ifeq ($(HAVE_THREADSAFE_STATICS),TRUE) gb_GLOBALDEFS += -DHAVE_THREADSAFE_STATICS endif |