diff options
| author | Tor Lillqvist <tml@iki.fi> | 2013-03-19 10:07:11 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2013-03-19 10:08:49 +0200 |
| commit | f98c6043fcbecd1b0f22d2a4624e19369b2fa8fa (patch) | |
| tree | 2f3a0cd3ce86f08ace017cefb7b2a83db5e99ac7 /bridges | |
| parent | 3e156923442e24612c3754e96c8b96838a751135 (diff) | |
Move the WNTGCC case under the case for CPU=I
Otherwise no case matched for the MinGW build.
Change-Id: Ia57c7cf09dbd450c91c4e595c7070ce82b484797
Diffstat (limited to 'bridges')
| -rw-r--r-- | bridges/Library_cpp_uno.mk | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/bridges/Library_cpp_uno.mk b/bridges/Library_cpp_uno.mk index 0bb3be8e8952..6eefed660317 100644 --- a/bridges/Library_cpp_uno.mk +++ b/bridges/Library_cpp_uno.mk @@ -76,6 +76,10 @@ 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_noopt_objects := uno2cpp +bridge_exception_objects := callvirtualmethod cpp2uno dllinit except smallstruct endif else ifeq ($(OS)$(CPU),LINUX6) @@ -153,12 +157,6 @@ bridges_SELECTED_BRIDGE := gcc3_solaris_sparc bridge_noopt_objects := cpp2uno uno2cpp bridge_exception_objects := except -else ifeq ($(OS)$(COM),WNTGCC) - -bridges_SELECTED_BRIDGE := mingw_intel -bridge_noopt_objects := uno2cpp -bridge_exception_objects := callvirtualmethod cpp2uno dllinit except smallstruct - endif $(eval $(call gb_Library_use_external,$(bridge_lib_name),boost_headers)) |