diff options
| -rw-r--r-- | RepositoryExternal.mk | 9 | ||||
| -rw-r--r-- | external/icu/ExternalPackage_icu.mk | 16 | ||||
| -rw-r--r-- | solenv/gbuild/platform/com_GCC_class.mk | 3 | ||||
| -rw-r--r-- | solenv/gbuild/platform/com_MSC_class.mk | 2 |
4 files changed, 11 insertions, 19 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 639d22ae763f..79158939e7fb 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -3145,7 +3145,8 @@ endef else # ! SYSTEM_GENBRK define gb_ExternalExecutable__register_genbrk -$(call gb_ExternalExecutable_set_internal,genbrk,$(OUTDIR_FOR_BUILD)/bin/genbrk$(gb_Executable_EXT_for_build)) +$(call gb_ExternalExecutable_set_internal,genbrk,$(WORKDIR_FOR_BUILD)/UnpackedTarball/icu/source/bin/genbrk$(gb_Executable_EXT_for_build)) +$(call gb_ExternalExecutable_set_precommand,genbrk,$(gb_ICU_PRECOMMAND)) $(call gb_ExternalExecutable_add_dependencies,genbrk,\ $(call gb_Package_get_target_for_build,icu) \ ) @@ -3164,7 +3165,8 @@ endef else # ! SYSTEM_GENCCODE define gb_ExternalExecutable__register_genccode -$(call gb_ExternalExecutable_set_internal,genccode,$(OUTDIR_FOR_BUILD)/bin/genccode$(gb_Executable_EXT_for_build)) +$(call gb_ExternalExecutable_set_internal,genccode,$(WORKDIR_FOR_BUILD)/UnpackedTarball/icu/source/bin/genccode$(gb_Executable_EXT_for_build)) +$(call gb_ExternalExecutable_set_precommand,genccode,$(gb_ICU_PRECOMMAND)) $(call gb_ExternalExecutable_add_dependencies,genccode,\ $(call gb_Package_get_target_for_build,icu) \ ) @@ -3183,7 +3185,8 @@ endef else # ! SYSTEM_GENCMN define gb_ExternalExecutable__register_gencmn -$(call gb_ExternalExecutable_set_internal,gencmn,$(OUTDIR_FOR_BUILD)/bin/gencmn$(gb_Executable_EXT_for_build)) +$(call gb_ExternalExecutable_set_internal,gencmn,$(WORKDIR_FOR_BUILD)/UnpackedTarball/icu/source/bin/gencmn$(gb_Executable_EXT_for_build)) +$(call gb_ExternalExecutable_set_precommand,gencmn,$(gb_ICU_PRECOMMAND)) $(call gb_ExternalExecutable_add_dependencies,gencmn,\ $(call gb_Package_get_target_for_build,icu) \ ) diff --git a/external/icu/ExternalPackage_icu.mk b/external/icu/ExternalPackage_icu.mk index baf38c77aa25..635e9d7d93b4 100644 --- a/external/icu/ExternalPackage_icu.mk +++ b/external/icu/ExternalPackage_icu.mk @@ -23,11 +23,6 @@ $(eval $(call gb_ExternalPackage_add_libraries_for_install,icu,bin,\ source/lib/icuin$(ICU_MAJOR).dll \ source/lib/icutu$(ICU_MAJOR).dll \ )) -$(eval $(call gb_ExternalPackage_add_files,icu,bin,\ - source/bin/genccode.exe \ - source/bin/genbrk.exe \ - source/bin/gencmn.exe \ -)) else $(eval $(call gb_ExternalPackage_add_libraries_for_install,icu,bin,\ source/lib/icudt$(if $(MSVC_USE_DEBUG_RUNTIME),d)$(ICU_MAJOR).dll \ @@ -35,11 +30,6 @@ $(eval $(call gb_ExternalPackage_add_libraries_for_install,icu,bin,\ source/lib/icuin$(if $(MSVC_USE_DEBUG_RUNTIME),d)$(ICU_MAJOR).dll \ source/lib/icutu$(if $(MSVC_USE_DEBUG_RUNTIME),d)$(ICU_MAJOR).dll \ )) -$(eval $(call gb_ExternalPackage_add_files,icu,bin,\ - source/bin/genccode.exe \ - source/bin/genbrk.exe \ - source/bin/gencmn.exe \ -)) endif # $(COM) else ifeq ($(OS),ANDROID) @@ -58,12 +48,6 @@ $(eval $(call gb_ExternalPackage_add_library_for_install,icu,lib/libicuuc$(gb_Li $(eval $(call gb_ExternalPackage_add_library_for_install,icu,lib/libicui18n$(gb_Library_DLLEXT).$(ICU_MAJOR),source/lib/libicui18n$(gb_Library_DLLEXT).$(icu_VERSION))) $(eval $(call gb_ExternalPackage_add_file,icu,lib/libicutu$(gb_Library_DLLEXT).$(ICU_MAJOR),source/lib/libicutu$(gb_Library_DLLEXT).$(icu_VERSION))) -$(eval $(call gb_ExternalPackage_add_files,icu,bin,\ - source/bin/genccode \ - source/bin/genbrk \ - source/bin/gencmn \ -)) - endif # $(OS) endif # DISABLE_DYNLOADING diff --git a/solenv/gbuild/platform/com_GCC_class.mk b/solenv/gbuild/platform/com_GCC_class.mk index 1bb16ba95d04..88542e1244a8 100644 --- a/solenv/gbuild/platform/com_GCC_class.mk +++ b/solenv/gbuild/platform/com_GCC_class.mk @@ -228,4 +228,7 @@ gb_LinkTarget_get_linksearchpath_for_layer = \ $(patsubst $(layer):%,-L%,\ $(filter $(layer):%,$(gb_Library_LAYER_DIRS)))) + +gb_ICU_PRECOMMAND := $(call gb_Helper_extend_ld_path,$(WORKDIR_FOR_BUILD)/UnpackedTarball/icu/source/lib) + # vim: set noet sw=4 ts=4: diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk index 2648591c67bb..8e00102b05f0 100644 --- a/solenv/gbuild/platform/com_MSC_class.mk +++ b/solenv/gbuild/platform/com_MSC_class.mk @@ -572,4 +572,6 @@ gb_UIMenubarTarget_UIMenubarTarget_platform := gb_Python_PRECOMMAND := PATH="$(shell cygpath -w $(INSTDIR)/program);$(shell cygpath -w $(OUTDIR)/bin)" PYTHONHOME="$(INSTDIR)/program/python-core-$(PYTHON_VERSION)" PYTHONPATH="$(INSTDIR)/program/python-core-$(PYTHON_VERSION)/lib;$(INSTDIR)/program/python-core-$(PYTHON_VERSION)/lib/lib-dynload:$(INSTDIR)/program" gb_Python_INSTALLED_EXECUTABLE := $(INSTROOT)/$(LIBO_BIN_FOLDER)/python.exe +gb_ICU_PRECOMMAND := PATH="$(shell cygpath -w $(WORKDIR_FOR_BUILD)/UnpackedTarball/icu/source/lib)" + # vim: set noet sw=4: |