diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2017-02-10 14:05:21 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2017-02-10 18:01:27 +0000 |
| commit | 8646ab97dc37c0606b19057686bf3d610f9c15ee (patch) | |
| tree | 17b3df6f5cf55cb1091c4aa70930dd415d9ea0e3 /bridges/Library_cpp_uno.mk | |
| parent | 09e9274fc080b471393b806617eb03124db67590 (diff) | |
Remove MinGW support
In OOo times, there'd originally been efforts to allow building on Windows with
MinGW. Later, in LO times, this has been shifted to an attempt of cross-
compiling for Windows on Linux. That attempt can be considered abandoned, and
the relevant code rotting.
Due to this heritage, there are now three kinds of MinGW-specific code in LO:
* Code from the original OOo native Windows effort that is no longer relevant
for the LO cross-compilation effort, but has never been removed properly.
* Code from the original OOo native Windows effort that is re-purposed for the
LO cross-compilation effort.
* Code that has been added specifially for the LO cross-compilation effort.
All three kinds of code are removed.
(An unrelated, remaining use of MinGW is for --enable-build-unowinreg, utilizing
--with-mingw-cross-compiler, MINGWCXX, and MINGWSTRIP.)
Change-Id: I49daad8669b4cbe49fa923050c4a4a6ff7dda568
Reviewed-on: https://gerrit.libreoffice.org/34127
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'bridges/Library_cpp_uno.mk')
| -rw-r--r-- | bridges/Library_cpp_uno.mk | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/bridges/Library_cpp_uno.mk b/bridges/Library_cpp_uno.mk index d7ec27dd1ea5..6486ea2cbda4 100644 --- a/bridges/Library_cpp_uno.mk +++ b/bridges/Library_cpp_uno.mk @@ -81,11 +81,6 @@ else ifeq ($(COM),MSC) bridges_SELECTED_BRIDGE := msvc_win32_intel bridge_exception_objects := cpp2uno dllinit uno2cpp bridge_noopt_objects := except -else ifeq ($(OS)$(COM),WNTGCC) -bridges_SELECTED_BRIDGE := mingw_intel -bridge_asm_objects := call -bridge_noopt_objects := uno2cpp -bridge_exception_objects := callvirtualmethod cpp2uno dllinit except smallstruct endif else ifeq ($(CPUNAME),M68K) @@ -182,11 +177,6 @@ bridges_SELECTED_BRIDGE := msvc_win32_x86-64 bridge_exception_objects := cpp2uno dllinit uno2cpp bridge_noopt_objects := except bridge_asm_objects := call -else ifeq ($(OS)$(COM),WNTGCC) -bridges_SELECTED_BRIDGE := mingw_x86-64 -bridge_asm_objects := call -bridge_noncallexception_noopt_objects := callvirtualmethod -bridge_exception_objects := abi cpp2uno except uno2cpp endif endif @@ -207,13 +197,9 @@ $(eval $(call gb_Library_add_defs,$(gb_CPPU_ENV)_uno,\ endif ifeq ($(OS),WNT) $(eval $(call gb_Library_add_defs,$(gb_CPPU_ENV)_uno,\ - $(if $(filter GCC,$(COM)),\ - $(if $(filter sjlj,$(EXCEPTIONS)),\ - -DBROKEN_ALLOCA \ - ), \ $(if $(cppu_no_leak)$(bndchk),,\ -DLEAK_STATIC_DATA \ - )) \ + ) \ )) endif |