Attachment #21718 for issue #41026

View | Details | Raw Unified | Return to issue 41026
Collapse All | Expand All




      $CPU            = "I";
      $CPUNAME        = "INTEL";
      $DLLSUFFIX      = "li";
      $OUTPATH        = "unxlngi6"
      $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386";
      $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."client";
      $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads";

      $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."arm".$ds."client";
      $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."arm".$ds."native_threads";
   }
   #Conditional setting depending on gcc3 (on x86):
   $CVER           = "C300";
   if (($machine_type eq "i686") or ($machine_type eq "i586"))
   {
        $OUTPATH      = "unxlngi4"
   }
   # General Linux settings:

      $CVER           = "C341";
      $BIG_SVX        = "TRUE";
      $COM            = "GCC";
      $COMPATH        = '@COMPATH@'; 

ToFile( "CC",                $CC,                "e" );
ToFile( "CXX",               $CXX,               "e" );
ToFile( "USE_SYSTEM_STL",    "@USE_SYSTEM_STL@", "e" );
if ( $COM ne "MSC" ) {
  ToFile( "LINK",			 $CC,				 "e" );
}
ToFile( "ENABLE_SYMBOLS",    "@ENABLE_SYMBOLS@",    "e" );
ToFile( "ENABLE_CRASHDUMP",  "@ENABLE_CRASHDUMP@",  "e" );
ToFile( "ENABLE_CUPS",       "@ENABLE_CUPS@",       "e" );

Return to issue 41026

Lines 344-349 elsif ( $platform eq "$Linux" ) Link Here

(-)set_soenv.in (-9 / +2 lines)
344	$CPU = "I";	344	$CPU = "I";
345	$CPUNAME = "INTEL";	345	$CPUNAME = "INTEL";
346	$DLLSUFFIX = "li";	346	$DLLSUFFIX = "li";
		347	$OUTPATH = "unxlngi6"
347	$JRELIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386";	348	$JRELIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386";
348	$JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."client";	349	$JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."client";
349	$JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads";	350	$JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."i386".$ds."native_threads";
Lines 416-429 elsif ( $platform eq "$Linux" ) Link Here
416	$JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."arm".$ds."client";	417	$JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."arm".$ds."client";
417	$JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."arm".$ds."native_threads";	418	$JRETHREADDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."arm".$ds."native_threads";
418	}	419	}
419	#Conditional setting depending on gcc3 (on x86):
420	$CVER = "C300";
421	if (($machine_type eq "i686") or ($machine_type eq "i586"))
422	{
423	$OUTPATH = "unxlngi4"
424	}
425	# General Linux settings:	420	# General Linux settings:
426		421
		422	$CVER = "C341";
427	$BIG_SVX = "TRUE";	423	$BIG_SVX = "TRUE";
428	$COM = "GCC";	424	$COM = "GCC";
429	$COMPATH = '@COMPATH@';	425	$COMPATH = '@COMPATH@';
Lines 1697-1705 ToFile( "JAVAHOME", $JAVAHOME, Link Here
1697	ToFile( "CC", $CC, "e" );	1693	ToFile( "CC", $CC, "e" );
1698	ToFile( "CXX", $CXX, "e" );	1694	ToFile( "CXX", $CXX, "e" );
1699	ToFile( "USE_SYSTEM_STL", "@USE_SYSTEM_STL@", "e" );	1695	ToFile( "USE_SYSTEM_STL", "@USE_SYSTEM_STL@", "e" );
1700	if ( $COM ne "MSC" ) {
1701	ToFile( "LINK", $CC, "e" );
1702	}
1703	ToFile( "ENABLE_SYMBOLS", "@ENABLE_SYMBOLS@", "e" );	1696	ToFile( "ENABLE_SYMBOLS", "@ENABLE_SYMBOLS@", "e" );
1704	ToFile( "ENABLE_CRASHDUMP", "@ENABLE_CRASHDUMP@", "e" );	1697	ToFile( "ENABLE_CRASHDUMP", "@ENABLE_CRASHDUMP@", "e" );
1705	ToFile( "ENABLE_CUPS", "@ENABLE_CUPS@", "e" );	1698	ToFile( "ENABLE_CUPS", "@ENABLE_CUPS@", "e" );