diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2020-07-17 23:03:59 +0200 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2020-09-11 18:26:51 +0200 |
| commit | 114ed73a7ba56e013e6d7f886798915fb20c0946 (patch) | |
| tree | ef56d7c8f04cc0541ad00f2ec3100b381833914a /distro-configs | |
| parent | 03c65d3ed080661430d4af2424d8f525bef67c62 (diff) | |
WIN drop --enable-64bit to select Windows target
This changes the Windows build to use the default configure switch
to select the target / host of the compiled binaries to get the
possibility to cross compile on Windows the "default" way.
Note that selecting i686-pc-cygwin on x86_64 doesn't do a cross-
compilation, as no special build tools are needed, because x86_64
can run x86 binaries just fine.
A consequence of the change is the default target host, which is
now the same then the build system, instead of the previous x86
default.
Change-Id: I5584f34f665573ebac40d5d7753d96addeb84dbb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102479
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Diffstat (limited to 'distro-configs')
| -rw-r--r-- | distro-configs/Jenkins/windows_msc_dbgutil_32 | 2 | ||||
| -rw-r--r-- | distro-configs/LibreOfficeWin32.conf | 1 | ||||
| -rw-r--r-- | distro-configs/LibreOfficeWin64.conf | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/distro-configs/Jenkins/windows_msc_dbgutil_32 b/distro-configs/Jenkins/windows_msc_dbgutil_32 index 59e083ee952a..6d0e6df2facb 100644 --- a/distro-configs/Jenkins/windows_msc_dbgutil_32 +++ b/distro-configs/Jenkins/windows_msc_dbgutil_32 @@ -1,4 +1,4 @@ +--host=i686-pc-cygwin --enable-dbgutil --disable-symbols ---disable-64-bit --disable-dependency-tracking diff --git a/distro-configs/LibreOfficeWin32.conf b/distro-configs/LibreOfficeWin32.conf index 0ab2f1da2281..f469db3dba05 100644 --- a/distro-configs/LibreOfficeWin32.conf +++ b/distro-configs/LibreOfficeWin32.conf @@ -1,3 +1,4 @@ +--host=i686-pc-cygwin --without-junit --without-helppack-integration --enable-extension-integration diff --git a/distro-configs/LibreOfficeWin64.conf b/distro-configs/LibreOfficeWin64.conf index 8e1a73ffb653..7c3c1ae4e5ac 100644 --- a/distro-configs/LibreOfficeWin64.conf +++ b/distro-configs/LibreOfficeWin64.conf @@ -1,4 +1,4 @@ ---enable-64-bit +--host=x86_64-pc-cygwin --without-junit --without-helppack-integration --enable-extension-integration |