I have found that there are some things that need to be done
differently (based on buggy behavior of MIPSpro 7.4) and the current
OOo treats all MIPSpro as C730. This little patch adds a C740.
Feedback greatly appreciated.
cheers,
scott rankin
P.S. I created IZ 41937 and attached this patch there.
Index: config_office/set_soenv.in
===================================================================
RCS file: /cvs/tools/config_office/set_soenv.in,v
retrieving revision 1.37
diff -d -u -r1.37 set_soenv.in
--- config_office/set_soenv.in 18 Jan 2005 16:13:37 -0000 1.37
+++ config_office/set_soenv.in 2 Feb 2005 23:24:18 -0000
@@ -489,10 +489,25 @@
$CVER = "C300";
}
else {
- $COM = "C730";
- $CVER = "C730";
- $OUTPATH = "unxirxm3";
- }
+ open( COM, $ENV{"CC"} ." -v 2>&1 |" );
+
+ $CVER="0.0.0";
+ while( <COM> ) {
+ if( $_ =~ /version/i ) {
+ $CVER = $_;
+ }
+ }
+
+ if($CVER =~ m/\b7\.4\b$/) {
+ $COM = "C740";
+ $CVER = "C740";
+ }
+ else {
+ $COM = "C730";
+ $CVER = "C730";
+ }
+ $OUTPATH = "unxirxm3";
+ }
$COMPATH = '@COMPATH@';
$CPU = "M";
$CPUNAME = "MIPS";
Index: solenv/inc/tg_compv.mk
===================================================================
RCS file: /cvs/tools/solenv/inc/tg_compv.mk,v
retrieving revision 1.15
diff -d -u -r1.15 tg_compv.mk
--- solenv/inc/tg_compv.mk 16 Jun 2004 10:35:02 -0000 1.15
+++ solenv/inc/tg_compv.mk 2 Feb 2005 23:28:26 -0000
@@ -87,7 +87,7 @@
CFLAGSNUMVERSION_CMD= -V |& $(AWK) -v num=true -f
$(SOLARENV)$/bin$/getcompver.awk
.ENDIF
-.IF "$(COM)"=="C730"
+.IF "$(COM)"=="C730" || "$(COM)"=="C740"
CFLAGSVERSION= -version
CFLAGSVERSION_CMD= -version |& cut -d" " -f4-
CFLAGSNUMVERSION_CMD= -version |& cut -d" " -f4-
@@ -150,7 +150,12 @@
.IF "$(COM)"=="C730"
COMID=C730
-COMNAME=MipsPro
+COMNAME=MIPSpro
+.ENDIF
+
+.IF "$(COM)"=="C740"
+COMID=C740
+COMNAME=MIPSpro
.ENDIF
.IF "$(COMNAME)"==""
Index: solenv/inc/unx.mk
===================================================================
RCS file: /cvs/tools/solenv/inc/unx.mk,v
retrieving revision 1.27
diff -d -u -r1.27 unx.mk
--- solenv/inc/unx.mk 18 Jan 2005 14:50:42 -0000 1.27
+++ solenv/inc/unx.mk 2 Feb 2005 23:28:26 -0000
@@ -193,7 +193,7 @@
.ENDIF
-.IF "$(COM)$(OS)$(CPU)" == "C730IRIXM"
+.IF "$(COM)$(OS)$(CPU)" == "C730IRIXM" || "$(COM)$(OS)$(CPU)" == "C740IRIXM"
.INCLUDE : unxirxm3.mk
.ENDIF
Index: solenv/inc/unxirxm3.mk
===================================================================
RCS file: /cvs/tools/solenv/inc/unxirxm3.mk,v
retrieving revision 1.6
diff -d -u -r1.6 unxirxm3.mk
--- solenv/inc/unxirxm3.mk 17 Dec 2003 18:08:18 -0000 1.6
+++ solenv/inc/unxirxm3.mk 2 Feb 2005 23:28:26 -0000
@@ -186,9 +186,9 @@
RCLINKFLAGS=
RCSETVERSION=
-DLLPOSTFIX= im
-DLLPRE= lib
-DLLPOST= .so
+DLLPOSTFIX=im
+DLLPRE=lib
+DLLPOST=.so
LDUMP=c++filt
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
