diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2021-12-13 18:21:11 +0100 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2021-12-16 11:17:08 +0100 |
| commit | bd1868c1057f0582f1a733bb90eca0c1c7e07933 (patch) | |
| tree | ae3a4d96c7344895df0f2a049358283a0a948bdb /sal | |
| parent | 48cb441fceab83a6320dc871f291dcb313696650 (diff) | |
Refactor Library_sal_textenc build condition
... by adding and using gb_CondSalTextEncodingLibrary.
Change-Id: I04e8f56bde6296477d449f1c447e8133cdf86e6e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126788
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Diffstat (limited to 'sal')
| -rw-r--r-- | sal/Library_sal.mk | 12 | ||||
| -rw-r--r-- | sal/Module_sal.mk | 2 |
2 files changed, 3 insertions, 11 deletions
diff --git a/sal/Library_sal.mk b/sal/Library_sal.mk index a323aedaa7b1..ac121098273f 100644 --- a/sal/Library_sal.mk +++ b/sal/Library_sal.mk @@ -130,7 +130,8 @@ $(eval $(call gb_Library_add_cxxflags,sal,\ )) endif -sal_textenc_code= \ +ifeq (,$(call gb_CondSalTextEncodingLibrary,$(true))) +$(eval $(call gb_Library_add_exception_objects,sal,\ sal/textenc/context \ sal/textenc/convertbig5hkscs \ sal/textenc/converteuctw \ @@ -144,15 +145,6 @@ sal_textenc_code= \ sal/textenc/tcvtbyte \ sal/textenc/tcvtmb \ sal/textenc/tcvtutf7 \ - -ifeq ($(OS),ANDROID) -$(eval $(call gb_Library_add_exception_objects,sal,\ - $(sal_textenc_code) \ -)) -else ifeq ($(DISABLE_DYNLOADING),TRUE) - -$(eval $(call gb_Library_add_exception_objects,sal,\ - $(sal_textenc_code) \ )) endif diff --git a/sal/Module_sal.mk b/sal/Module_sal.mk index 1a190037f05b..19bf547ad572 100644 --- a/sal/Module_sal.mk +++ b/sal/Module_sal.mk @@ -14,7 +14,7 @@ $(eval $(call gb_Module_add_targets,sal,\ $(if $(filter $(OS),ANDROID), \ Library_lo-bootstrap) \ Library_sal \ - $(if $(filter $(OS),ANDROID),,$(if $(filter TRUE,$(DISABLE_DYNLOADING)),,Library_sal_textenc)) \ + $(call gb_CondSalTextEncodingLibrary,Library_sal_textenc) \ )) ifneq (,$(filter DESKTOP,$(BUILD_TYPE))) |