mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fdo#71000: Fix SOLARIS-INTEL case

Browse Source 
Thanks to Dagobert Michelsen for noticing.

Change-Id: Ife333e74c145ad71c451cb60ba9a8ee4222a2183
This commit is contained in:
Stephan Bergmann
2014-06-23 10:54:19 +02:00
parent 96e23564e9
commit 94b2fe9b00
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
bridges/Library_cpp_uno.mk
View File

@@ -63,6 +63,9 @@ else ifeq ($(OS),MACOSX)
bridges_SELECTED_BRIDGE := gcc3_macosx_intel bridges_SELECTED_BRIDGE := gcc3_macosx_intel
bridge_asm_objects := call bridge_asm_objects := call
bridge_exception_objects := cpp2uno except uno2cpp 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) else ifeq ($(COM),MSC)
bridges_SELECTED_BRIDGE := msvc_win32_intel bridges_SELECTED_BRIDGE := msvc_win32_intel
bridge_exception_objects := cpp2uno dllinit uno2cpp bridge_exception_objects := cpp2uno dllinit uno2cpp
@@ -145,11 +148,6 @@ bridges_SELECTED_BRIDGE := gcc3_macosx_powerpc
bridge_noopt_objects := uno2cpp bridge_noopt_objects := uno2cpp
bridge_exception_objects := cpp2uno except 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) else ifeq ($(OS)-$(CPUNAME),SOLARIS-SPARC)
bridges_SELECTED_BRIDGE := gcc3_solaris_sparc bridges_SELECTED_BRIDGE := gcc3_solaris_sparc