summaryrefslogtreecommitdiff
path: root/solenv/inc/tg_compv.mk
diff options
context:
space:
mode:
authorCaolán McNamara <cmc@openoffice.org>2010-05-22 15:59:46 +0100
committerCaolán McNamara <cmc@openoffice.org>2010-05-22 15:59:46 +0100
commite46b02d99de966eaf3edb0801dd4d403d59b4cfa (patch)
treec1730f0a4460dcf931f3ba397b48b437f7af7463 /solenv/inc/tg_compv.mk
parent2d04ea5160c67570ddcc0031e11f3acaab0b2d25 (diff)
cmcfixes75: #i111770# remove configure.in hacks and handle prelinked system-stdlibs properly and fix the so.1 -> so.2 for hppa and m68k
Diffstat (limited to 'solenv/inc/tg_compv.mk')
-rw-r--r--solenv/inc/tg_compv.mk6
1 files changed, 6 insertions, 0 deletions
diff --git a/solenv/inc/tg_compv.mk b/solenv/inc/tg_compv.mk
index 8218887528fe..619d392b2650 100644
--- a/solenv/inc/tg_compv.mk
+++ b/solenv/inc/tg_compv.mk
@@ -77,6 +77,7 @@ COMNAME=msci
.IF "$(COM)"=="GCC"
SHORTSTDCPP3:=
+SHORTSTDC3:="1"
.IF "$(CCNUMVER)">="000200910000"
COMID=GCC
@@ -101,6 +102,11 @@ SHORTSTDCPP3="5"
.ENDIF
.IF "$(CCNUMVER)">="000300040000"
+.IF "$(OS)$(CPU)" == "LINUXH" || "$(OS)$(CPU)" == "LINUX6"
+#gcc >= 3.4.0: on m68k-linux and hppa-linux this is libgcc_s.so.2. For all
+#others, this is libgcc_s.so.1.
+SHORTSTDC3:="2"
+.ENDIF
SHORTSTDCPP3="6"
.ENDIF