diff options
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | RepositoryFixes.mk | 1 | ||||
| -rw-r--r-- | basic/Library_sb.mk | 15 | ||||
| -rw-r--r-- | basic/Module_basic.mk | 2 |
4 files changed, 15 insertions, 9 deletions
@@ -384,12 +384,12 @@ bootstrap: $(WORKDIR_BOOTSTRAP) # build: bootstrap fetch $(if $(filter $(INPATH),$(INPATH_FOR_BUILD)),,cross-toolset) ifeq ($(DISABLE_SCRIPTING),TRUE) -# We must get the headers from basic and vbahelper "delivered" because -# as we don't link to any libs from those they won't otherwise be, or +# We must get the headers from vbahelper "delivered" because +# as we don't link to any libs from there they won't otherwise be, or # something. And we still do include those headers always even if the # libs aren't built in the --disable-scripting case. (Ifdefs for # DISABLE_SCRIPTING will be added to the code later as necessary.) - $(GNUMAKE) basic vbahelper + $(GNUMAKE) vbahelper endif ifeq ($(DISABLE_DBCONNECTIVITY),TRUE) # Ditto for dbconnectivity in the --disable-database-connectivity case diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk index ef2b957105cc..c15643f62df7 100644 --- a/RepositoryFixes.mk +++ b/RepositoryFixes.mk @@ -132,7 +132,6 @@ endif # ifeq ($(OS),WNT) ifeq (,$(filter SCRIPTING,$(BUILD_TYPE))) -gb_Library_FILENAMES := $(patsubst sb:libsb%,,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst vbahelper:libvbahelper%,,$(gb_Library_FILENAMES)) endif diff --git a/basic/Library_sb.mk b/basic/Library_sb.mk index 017168278608..4ba93cb1531e 100644 --- a/basic/Library_sb.mk +++ b/basic/Library_sb.mk @@ -64,6 +64,8 @@ $(eval $(call gb_Library_add_linked_libs,sb,\ $(gb_STDLIBS) \ )) +ifneq ($(DISABLE_SCRIPTING),TRUE) + $(eval $(call gb_Library_add_exception_objects,sb,\ basic/source/basmgr/basicmanagerrepository \ basic/source/basmgr/basmgr \ @@ -102,8 +104,6 @@ $(eval $(call gb_Library_add_exception_objects,sb,\ basic/source/runtime/ddectrl \ basic/source/runtime/inputbox \ basic/source/runtime/iosys \ - basic/source/runtime/methods \ - basic/source/runtime/methods1 \ basic/source/runtime/props \ basic/source/runtime/runtime \ basic/source/runtime/sbdiagnose \ @@ -112,13 +112,21 @@ $(eval $(call gb_Library_add_exception_objects,sb,\ basic/source/runtime/step0 \ basic/source/runtime/step1 \ basic/source/runtime/step2 \ + basic/source/sbx/sbxmstrm \ +)) + +endif + +$(eval $(call gb_Library_add_exception_objects,sb,\ + basic/source/runtime/methods \ + basic/source/runtime/methods1 \ basic/source/sbx/sbxarray \ - basic/source/sbx/sbxbase \ basic/source/sbx/sbxbool \ basic/source/sbx/sbxbyte \ basic/source/sbx/sbxchar \ basic/source/sbx/sbxcoll \ basic/source/sbx/sbxcurr \ + basic/source/sbx/sbxbase \ basic/source/sbx/sbxdate \ basic/source/sbx/sbxdbl \ basic/source/sbx/sbxdec \ @@ -126,7 +134,6 @@ $(eval $(call gb_Library_add_exception_objects,sb,\ basic/source/sbx/sbxform \ basic/source/sbx/sbxint \ basic/source/sbx/sbxlng \ - basic/source/sbx/sbxmstrm \ basic/source/sbx/sbxobj \ basic/source/sbx/sbxres \ basic/source/sbx/sbxscan \ diff --git a/basic/Module_basic.mk b/basic/Module_basic.mk index bbd9b6124e24..c3ba0ee72581 100644 --- a/basic/Module_basic.mk +++ b/basic/Module_basic.mk @@ -32,7 +32,6 @@ ifneq ($(DISABLE_SCRIPTING),TRUE) $(eval $(call gb_Module_add_targets,basic,\ AllLangResTarget_sb \ - Library_sb \ )) $(eval $(call gb_Module_add_check_targets,basic,\ @@ -42,6 +41,7 @@ $(eval $(call gb_Module_add_check_targets,basic,\ endif $(eval $(call gb_Module_add_targets,basic,\ + Library_sb \ Package_inc \ )) |