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 | 7af5447b9f1074d062781830b6d6c47a2e123b83 (patch) | |
| tree | f34d9d09703b016f6f2dbfe4a1a04b836f16f1fa /solenv | |
| parent | 6d5beb78ce67043d2e418eacdf95ab4fc6996192 (diff) | |
| parent | 7724bf7470493b58e0091282954defcac662e847 (diff) | |
CWS-TOOLING: integrate CWS cmcfixes75
Diffstat (limited to 'solenv')
| -rwxr-xr-x | solenv/bin/gccinstlib.pl | 9 | ||||
| -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 |
4 files changed, 25 insertions, 1 deletions
diff --git a/solenv/bin/gccinstlib.pl b/solenv/bin/gccinstlib.pl index 7f52218c5..8ce9753a4 100755 --- a/solenv/bin/gccinstlib.pl +++ b/solenv/bin/gccinstlib.pl @@ -53,4 +53,13 @@ foreach $Src (@CopySrc) { system ("/bin/cp $Src $Dest") && die "copy failed: $!"; } + +foreach $File (@ARGV) { + #https://bugzilla.redhat.com/show_bug.cgi?id=149465 + printf "unprelinking $Dest/$File\n"; + #If it's already unprelinked .i.e. no .gnu.prelink_undo section, that's fine + #If prelink is not installed, it's massively unlikely that it's prelinked + system ("prelink -u $Dest/$File > /dev/null 2>&1"); +} + exit (0); diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk index ccd8f929d..c5283fb1b 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 252ecf3bd..1a4ad6e18 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 821888752..c68ae5af4 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 |