Kaydet (Commit) 94b2fe9b authored tarafından Stephan Bergmann's avatar Stephan Bergmann

fdo#71000: Fix SOLARIS-INTEL case

Thanks to Dagobert Michelsen for noticing.

Change-Id: Ife333e74c145ad71c451cb60ba9a8ee4222a2183
üst 96e23564
...@@ -63,6 +63,9 @@ else ifeq ($(OS),MACOSX) ...@@ -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 ...@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment