You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by pe...@apache.org on 2026/07/25 09:00:34 UTC

(openoffice) 20/20: build/win64: strip CPPU_ENV=msci from the SUBPACKAGE BUILD files the sweep missed

This is an automated email from the ASF dual-hosted git repository.

leginee pushed a commit to branch bazel-migration
in repository https://gitbox.apache.org/repos/asf/openoffice.git

commit aeee5d0983e18d07aa60722c6ea7f0716f15ee05
Author: Peter Kovacs <pe...@apache.org>
AuthorDate: Sat Jul 25 10:48:12 2026 +0200

    build/win64: strip CPPU_ENV=msci from the SUBPACKAGE BUILD files the sweep missed
    
    The earlier CPPU_ENV-global change swept "for f in main/*/BUILD.bazel", which
    does not match nested BUILD files.  main/i18npool/pool/BUILD.bazel (builds
    i18npool.dll) and main/extensions/source/oooimprovement/BUILD.bazel still forced
    CPPU_ENV=msci, which overrides the toolchain's global mscx on x64 (per-target
    defines come after the toolchain defaults, last-wins).  So i18npool.dll compiled
    as msci -> its LocaleData / CharacterClassification components reported the x86
    UNO environment on x64 -> shlib.cxx "cannot get uno environments!" FatalError
    (env.is=0) during startup.
    
    Strip the literals so both rely on the global arch_defines like every other
    module.  Swept every BUILD.bazel at any depth to confirm none remain.
    
    Co-Authored-By: Claude Opus 4.8 <no...@anthropic.com>
    (cherry picked from commit e8baa4edf1cad0690c66211c6a720568f935b358)
---
 main/extensions/source/oooimprovement/BUILD.bazel | 1 -
 main/i18npool/pool/BUILD.bazel                    | 1 -
 2 files changed, 2 deletions(-)

diff --git a/main/extensions/source/oooimprovement/BUILD.bazel b/main/extensions/source/oooimprovement/BUILD.bazel
index 4552c375d8..c2b0821fdc 100644
--- a/main/extensions/source/oooimprovement/BUILD.bazel
+++ b/main/extensions/source/oooimprovement/BUILD.bazel
@@ -20,7 +20,6 @@ cc_binary(
     defines = [
         "WNT", "GUI", "WIN32",
         "WINVER=0x0500", "_WIN32_WINNT=0x0500", "_WIN32_IE=0x0500",
-        "CPPU_ENV=msci", 
         "FULL_DESK", "SHAREDLIB", "_DLL_",
         "snprintf=_snprintf",
         "snwprintf=_snwprintf",
diff --git a/main/i18npool/pool/BUILD.bazel b/main/i18npool/pool/BUILD.bazel
index 25de05c545..af81b0d0d0 100644
--- a/main/i18npool/pool/BUILD.bazel
+++ b/main/i18npool/pool/BUILD.bazel
@@ -7,7 +7,6 @@ load("//main/i18npool:breakiter_pipeline.bzl", "breakiter_data")
 _DEFINES = [
     "WNT", "GUI", "WIN32",
     "WINVER=0x0500", "_WIN32_WINNT=0x0500", "_WIN32_IE=0x0500",
-    "CPPU_ENV=msci", 
     "FULL_DESK",
     "SHAREDLIB", "_DLL_",
     "I18NPOOL_DLLIMPLEMENTATION",