diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-06-23 10:54:19 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-06-23 10:54:19 +0200 |
| commit | 94b2fe9b00c28e12bbd98ade8c5a31179c290da0 (patch) | |
| tree | ad3895e43678d8c6af52627f43cb38c3332c212a /bridges/Library_cpp_uno.mk | |
| parent | webdav: Do not throw when saving new document. (diff) | |
| download | core-94b2fe9b00c28e12bbd98ade8c5a31179c290da0.tar.gz core-94b2fe9b00c28e12bbd98ade8c5a31179c290da0.zip | |
fdo#71000: Fix SOLARIS-INTEL case
Thanks to Dagobert Michelsen for noticing.
Change-Id: Ife333e74c145ad71c451cb60ba9a8ee4222a2183
Diffstat (limited to 'bridges/Library_cpp_uno.mk')
| -rw-r--r-- | bridges/Library_cpp_uno.mk | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/bridges/Library_cpp_uno.mk b/bridges/Library_cpp_uno.mk index c6ab9a065dd9..d929c868be4a 100644 --- a/bridges/Library_cpp_uno.mk +++ b/bridges/Library_cpp_uno.mk @@ -63,6 +63,9 @@ else ifeq ($(OS),MACOSX) bridges_SELECTED_BRIDGE := gcc3_macosx_intel bridge_asm_objects := call bridge_exception_objects := cpp2uno except uno2cpp +else ifeq ($(OS),SOLARIS) +bridges_SELECTED_BRIDGE := gcc3_solaris_intel +bridge_exception_objects := cpp2uno except uno2cpp else ifeq ($(COM),MSC) bridges_SELECTED_BRIDGE := msvc_win32_intel bridge_exception_objects := cpp2uno dllinit uno2cpp @@ -145,11 +148,6 @@ bridges_SELECTED_BRIDGE := gcc3_macosx_powerpc bridge_noopt_objects := uno2cpp bridge_exception_objects := cpp2uno except -else ifeq ($(OS)-$(CPUNAME),SOLARIS-INTEL) - -bridges_SELECTED_BRIDGE := gcc3_solaris_intel -bridge_exception_objects := cpp2uno except uno2cpp - else ifeq ($(OS)-$(CPUNAME),SOLARIS-SPARC) bridges_SELECTED_BRIDGE := gcc3_solaris_sparc |