[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - config_host.mk.in configure.ac solenv/gbuild

[Mike Kaganski (via logerrit)]

 config_host.mk.in                       |    1 -
 configure.ac                            |    5 -----
 solenv/gbuild/platform/com_MSC_class.mk |    4 ++--
 3 files changed, 2 insertions(+), 8 deletions(-)

New commits:
commit 034489fb640397db0160178e7ed70152f9c322ad
Author:     Mike Kaganski <mike.kaganski at collabora.com>
AuthorDate: Tue May 7 16:31:10 2019 +0300
Commit:     Mike Kaganski <mike.kaganski at collabora.com>
CommitDate: Thu Jun 20 09:54:01 2019 +0200

    Drop LINK_X64_BINARY: any MSVC linker is suitable for any target platform
    
    Change-Id: I8b080ad44f10e52fa5a726bd7cdf7dd8ff7e2dd4
    Reviewed-on: https://gerrit.libreoffice.org/71913
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>
    (cherry picked from commit 0c0e73584f125025fb17d6be8f8050f3b7649c7d)
    Reviewed-on: https://gerrit.libreoffice.org/74413
    Tested-by: Mike Kaganski <mike.kaganski at collabora.com>

diff --git a/config_host.mk.in b/config_host.mk.in
index 7ac6bc52c70e..7797492915fe 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -376,7 +376,6 @@ export LIBXML_JAR=@LIBXML_JAR@
 export LIBXML_LIBS=$(gb_SPACE)@LIBXML_LIBS@
 export LIBXSLT_CFLAGS=$(gb_SPACE)@LIBXSLT_CFLAGS@
 export LIBXSLT_LIBS=$(gb_SPACE)@LIBXSLT_LIBS@
-export LINK_X64_BINARY=@LINK_X64_BINARY@
 @x_Cygwin@ export LS=@WIN_LS@
 export MACOSX_BUNDLE_IDENTIFIER=@MACOSX_BUNDLE_IDENTIFIER@
 export MACOSX_CODESIGNING_IDENTITY=@MACOSX_CODESIGNING_IDENTITY@
diff --git a/configure.ac b/configure.ac
index 3ab3dd329890..3eaab42340ec 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3576,7 +3576,6 @@ if test "$_os" = "WINNT"; then
 
     BUILD_X64=
     CXX_X64_BINARY=
-    LINK_X64_BINARY=
 
     if test "$BITNESS_OVERRIDE" = ""; then
         AC_MSG_CHECKING([for a x64 compiler and libraries for 64-bit Explorer extensions])
@@ -3586,18 +3585,15 @@ if test "$_os" = "WINNT"; then
             if "$VC_PRODUCT_DIR/bin/amd64/cl.exe" -? </dev/null >/dev/null 2>&1; then
                 BUILD_X64=TRUE
                 CXX_X64_BINARY="$VC_PRODUCT_DIR/bin/amd64/cl.exe"
-                LINK_X64_BINARY="$VC_PRODUCT_DIR/bin/amd64/link.exe"
             elif "$VC_PRODUCT_DIR/bin/x86_amd64/cl.exe" -? </dev/null >/dev/null 2>&1; then
                 BUILD_X64=TRUE
                 CXX_X64_BINARY="$VC_PRODUCT_DIR/bin/x86_amd64/cl.exe"
-                LINK_X64_BINARY="$VC_PRODUCT_DIR/bin/x86_amd64/link.exe"
             fi
         elif test -f "$VC_PRODUCT_DIR/Tools/MSVC/$vcbuildnumber/atlmfc/lib/x64/atls.lib"; then
             # nobody uses 32-bit OS to build, just pick the 64-bit compiler
             if "$VC_PRODUCT_DIR/Tools/MSVC/$vcbuildnumber/bin/HostX64/x64/cl.exe" -? </dev/null >/dev/null 2>&1; then
                 BUILD_X64=TRUE
                 CXX_X64_BINARY="$VC_PRODUCT_DIR/Tools/MSVC/$vcbuildnumber/bin/HostX64/x64/cl.exe"
-                LINK_X64_BINARY="$VC_PRODUCT_DIR/Tools/MSVC/$vcbuildnumber/bin/HostX64/x64/link.exe"
             fi
         fi
         if test "$BUILD_X64" = TRUE; then
@@ -3611,7 +3607,6 @@ if test "$_os" = "WINNT"; then
 
     # These are passed to the environment and then used in gbuild/platform/com_MSC_class.mk
     AC_SUBST(CXX_X64_BINARY)
-    AC_SUBST(LINK_X64_BINARY)
 
     # Check for 32-bit compiler to use to build the 32-bit TWAIN shim
     # needed to support TWAIN scan on both 32- and 64-bit systems
diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk
index 4f369f04544f..6a1887dd31d6 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -168,7 +168,7 @@ $(call gb_Helper_abbreviate_dirs,\
 		$(PCHOBJS) $(NATIVERES)) && \
 		$(if $(filter $(call gb_Library__get_workdir_linktargetname,merged),$(2)),$(call gb_LinkTarget_MergedResponseFile)) \
 	unset INCLUDE && \
-	$(if $(filter YES,$(LIBRARY_X64)), $(LINK_X64_BINARY), $(gb_LINK)) \
+	$(gb_LINK) \
 		$(if $(filter Library CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \
 		$(if $(filter StaticLibrary,$(TARGETTYPE)),-LIB) \
 		$(if $(filter Executable,$(TARGETTYPE)),$(gb_Executable_TARGETTYPEFLAGS)) \
@@ -201,7 +201,7 @@ $(call gb_Helper_abbreviate_dirs,\
 	$(if $(filter YES,$(TARGETGUI)),&& mt.exe $(MTFLAGS) -nologo -manifest $(SRCDIR)/solenv/gbuild/platform/DeclareDPIAware.manifest -updateresource:$(1)\;1 ) \
 	$(if $(filter Library,$(TARGETTYPE)),&& \
 		echo $(notdir $(1)) > $(WORKDIR)/LinkTarget/$(2).exports.tmp && \
-		$(if $(filter YES,$(LIBRARY_X64)),$(LINK_X64_BINARY),$(gb_LINK)) \
+		$(gb_LINK) \
 			-dump -exports $(ILIBTARGET) \
 			>> $(WORKDIR)/LinkTarget/$(2).exports.tmp && \
 		$(call gb_Helper_replace_if_different_and_touch,$(WORKDIR)/LinkTarget/$(2).exports.tmp,$(WORKDIR)/LinkTarget/$(2).exports,$(1))) \