diff options
| author | obo <obo@openoffice.org> | 2010-06-22 15:46:16 +0200 |
|---|---|---|
| committer | obo <obo@openoffice.org> | 2010-06-22 15:46:16 +0200 |
| commit | bc47011daaacc04ce03336412637e15d940db520 (patch) | |
| tree | 89d2b4184a66d6b02946a568611665ca2e19fb3c /solenv/inc | |
| parent | d3b85f1a0d1d806440301606e06fb45ec3b68d77 (diff) | |
| parent | b96df8f62a8f7706bca64c9ab1eb577436a93974 (diff) | |
CWS-TOOLING: integrate CWS cmcfixes75
Diffstat (limited to 'solenv/inc')
| -rw-r--r-- | solenv/inc/settings.mk | 2 | ||||
| -rw-r--r-- | solenv/inc/target.mk | 1 | ||||
| -rw-r--r-- | solenv/inc/tg_compv.mk | 14 |
3 files changed, 16 insertions, 1 deletions
diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk index ccd8f929d5fe..c5283fb1b59e 100644 --- a/solenv/inc/settings.mk +++ b/solenv/inc/settings.mk @@ -865,7 +865,7 @@ SCPDEFS+=-DUDK_MAJOR=$(UDK_MAJOR) SCPDEFS+=-U$(COMID) -DCOMID=$(COMID) -DCOMNAME=$(COMNAME) -D_$(COMID) SCPDEFS+=-DCCNUMVER=$(CCNUMVER) .IF "$(COM)"=="GCC" -SCPDEFS+=-DSHORTSTDCPP3=$(SHORTSTDCPP3) +SCPDEFS+=-DSHORTSTDCPP3=$(SHORTSTDCPP3) -DSHORTSTDC3=$(SHORTSTDC3) .ENDIF # "$(SHORTSTDCPP3)"!="" # extend library path for OS/2 gcc/wlink .IF "$(GUI)"=="OS2" diff --git a/solenv/inc/target.mk b/solenv/inc/target.mk index 252ecf3bd460..1a4ad6e182a0 100644 --- a/solenv/inc/target.mk +++ b/solenv/inc/target.mk @@ -1461,6 +1461,7 @@ COMPVTMP:=$(mktmp iii) @echo COMID:=$(COMID) >> $(COMPVTMP) .IF "$(COM)"=="GCC" @echo SHORTSTDCPP3:=$(SHORTSTDCPP3) >> $(COMPVTMP) + @echo SHORTSTDC3:=$(SHORTSTDC3) >> $(COMPVTMP) .ENDIF @echo CCNUMVER:=$(CCNUMVER) >> $(COMPVTMP) @echo CCVER:=$(CCVER:s/-/ /:1) >> $(COMPVTMP) diff --git a/solenv/inc/tg_compv.mk b/solenv/inc/tg_compv.mk index 8218887528fe..c68ae5af430e 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,19 @@ SHORTSTDCPP3="5" .ENDIF .IF "$(CCNUMVER)">="000300040000" +.IF "$(OS)$(CPU)" == "LINUX6" || "$(OS)$(CPU)" == "LINUXH" +#for gcc >= 3.4.0 on m68k-linux this is libgcc_s.so.2. +#for gcc >= 3.4.0 < 4.2.0 on hppa-linux this is libgcc_s.so.2. +SHORTSTDC3:="2" +.ENDIF +SHORTSTDCPP3="6" +.ENDIF + +.IF "$(CCNUMVER)">="000400020000" +.IF "$(OS)$(CPU)" == "LINUXH" +#for gcc >= 4.2.0 on hppa-linux this is libgcc_s.so.4. +SHORTSTDC3:="4" +.ENDIF SHORTSTDCPP3="6" .ENDIF |