[Libreoffice-commits] core.git: solenv/gbuild

[Stephan Bergmann (via logerrit)]

 solenv/gbuild/platform/com_MSC_defs.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 396b12ec0b6c47a31e5f65784597bc3cf2803733
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Fri Oct 9 14:06:10 2020 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Fri Oct 9 15:43:41 2020 +0200

    Split off REAL_BUILD_CC_FLAGS from REAL_BUILD_CC
    
    ...same as is done with REAL_CC and REAL_CC_FLAGS in
    solenv/gbuild/platform/com_MSC_class.mk.  Otherwise, my clang-cl build (where
    CC and those REAL*_CC vars derived from it contains the executable plus a bunch
    of command line arguments) would fail in ExternalProject_libgpg-error with
    
    > Error: could not create process ""C:/llvm/inst/bin/clang.exe --driver-mode=cl -FIIntrin.h -fmsc-version=1927 -Qunused-arguments --target=x86_64-pc-windows-mscv -fansi-escape-codes -fcolor-diagnostics  -ferror-limit=0"  -nologo -EHsc -MDd -Gy -Ob1 -Oxs -Oy-  -IC:/lo-clang/core/include -IC:/PROGRA~2/WI3CF2~1/10/Include/10.0.18362.0/ucrt -IC:/PROGRA~2/WI3CF2~1/10/include -IC:/PROGRA~2/MIB055~1/2019/COMMUN~1/VC/Tools/MSVC/1427~1.291/Include -IC:/PROGRA~2/WI3CF2~1/10/Include/10.0.18362.0/um -IC:/PROGRA~2/WI3CF2~1/10/Include/10.0.18362.0/shared -IC:/java/ADOPTO~1.NET/x64/JDK-15~1/include/win32 -IC:/java/ADOPTO~1.NET/x64/JDK-15~1/include        -Zi -FS -I. -I. -Femkheader.exe ./mkheader.c -link -debug -LIBPATH:. -LIBPATH:C:/java/ADOPTO~1.NET/x64/JDK-15~1/lib -LIBPATH:C:/PROGRA~2/MIB055~1/2019/COMMUN~1/VC/Tools/MSVC/1427~1.291/lib/x64 -LIBPATH:C:/PROGRA~2/WI3CF2~1/10/lib/x64 -LIBPATH:C:/PROGRA~2/WI3CF2~1/10/lib/10.0.18362.0/um/x64 -LIBPATH:C:/PROGRA~2/WI3CF2~1/10/lib/10.0.18362.0/ucrt/
 x64 -LIBPATH:C:/PROGRA~2/WI3CF2~1/NETFXSDK/4.8//Lib/um/x64": 2
    
    Change-Id: I7246377874d89d3c0c9bf1c7951d29b7e3ae674a
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104118
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/solenv/gbuild/platform/com_MSC_defs.mk b/solenv/gbuild/platform/com_MSC_defs.mk
index 5a02731bac7b..892faf76931b 100644
--- a/solenv/gbuild/platform/com_MSC_defs.mk
+++ b/solenv/gbuild/platform/com_MSC_defs.mk
@@ -365,7 +365,7 @@ endef
 # we explicitly have to replace cygwin with mingw32 for the host, but the build must stay cygwin, or cmd.exe processes will be spawned
 gb_WIN_GPG_WINDRES_target := $(if $(filter INTEL,$(CPUNAME)),pe-i386,pe-x86-64)
 gb_WIN_GPG_platform_switches := --build=$(BUILD_PLATFORM) --host=$(subst cygwin,mingw32,$(HOST_PLATFORM))
-gb_WIN_GPG_cross_setup_exports = export REAL_BUILD_CC="$(CC_FOR_BUILD)" \
+gb_WIN_GPG_cross_setup_exports = export REAL_BUILD_CC="$(filter-out -%,$(CC_FOR_BUILD))" REAL_BUILD_CC_FLAGS="$(filter -%,$(CC_FOR_BUILD))" \
     && export CC_FOR_BUILD="$(call gb_Executable_get_target_for_build,gcc-wrapper) $(if $(verbose),--wrapper-print-cmdline) --wrapper-env-prefix=REAL_BUILD_ $(SOLARINC) -L$(subst ;, -L,$(ILIB_FOR_BUILD))" \
     && export RC='windres -O COFF --target=$(gb_WIN_GPG_WINDRES_target) --preprocessor='\''$(call gb_Executable_get_target_for_build,cpp) -+ -DRC_INVOKED -DWINAPI_FAMILY=0 $(SOLARINC)'\'