[Lunar-commits] r18960 - moonbase/trunk/zbeta/gcc4/plugin.d

[Auke Kok]

Author: sofar
Date: 2006-03-01 08:12:53 +0000 (Wed, 01 Mar 2006)
New Revision: 18960

Modified:
   moonbase/trunk/zbeta/gcc4/plugin.d/optimize-gcc_4_0.plugin
Log:
Same here - no PLATFORM choice.


Modified: moonbase/trunk/zbeta/gcc4/plugin.d/optimize-gcc_4_0.plugin
===================================================================
--- moonbase/trunk/zbeta/gcc4/plugin.d/optimize-gcc_4_0.plugin	2006-03-01 08:09:26 UTC (rev 18959)
+++ moonbase/trunk/zbeta/gcc4/plugin.d/optimize-gcc_4_0.plugin	2006-03-01 08:12:53 UTC (rev 18960)
@@ -144,16 +144,20 @@
 		esac
 	done
 
-	CC=/opt/lunar/gcc/4.0/bin/gcc
-	CXX=/opt/lunar/gcc/4.0/bin/g++
-	CPP=/opt/lunar/gcc/4.0/bin/cpp
+	COMPILER_PATH=/opt/lunar/gcc/4.0/bin
 
+	CC=gcc
+	CXX=g++
+	CPP=$COMPILER_PATH/cpp
+
 	export BUILD
+	export COMPILER_PATH
 	export COPT CCOPT
 	export CFLAGS CXXFLAGS CPPFLAGS
 	export CC CXX CPP
 
 	verbose_msg "BUILD=\"$BUILD\""
+	verbose_msg "COMPILER_PATH=\"$COMPILER_PATH\""
 	verbose_msg "CC=\"$CC\""
 	verbose_msg "CXX=\"$CXX\""
 	verbose_msg "CPP=\"$CPP\""
@@ -205,7 +209,6 @@
 	{
 		debug_msg "save_optimizations($@)"
 		cat >/etc/lunar/local/optimizations.GCC_4_0  <<EOF
-PLATFORM=$PLATFORM
 BUILD=$BUILD
 CPU=$CPU
 BOPT=$BOPT
@@ -243,9 +246,6 @@
 			  echo "Turn off optimization safety  [$SAFE_OPTIMIZATIONS]"
 			  echo "Allow potentially unsafe optimizations (DANGEROUS!)"
 			fi
-			echo "platform"
-			echo "Platform choice               [$PLATFORM]"
-			echo "Select the specific architecture like x87, ppc"
 			echo "bopt"
 			echo "Base speed optimization       [$BOPT]"
 			echo "Select the base optimization from -Os, -O0, -O1 etc"
@@ -296,17 +296,6 @@
 					fi
 				fi
 			;;
-			platform)
-				OPTIONS=(
-					"x86" "Intel, AMD, and clones" $( [ "$PLATFORM" == "x86" ] && echo "on" || echo "off" ) "Intel and AMD hardware"
-					"x86_64" "AMD64/EM64T" $( [ "$PLATFORM" == "x86_64" ] && echo "on" || echo "off" ) "Both AMD64 and Intel EM64T machines"
-					"Alpha" "Compaq Alpha" $( [ "$PLATFORM" == "Alpha" ] && echo "on" || echo "off" ) "Compaq Alpha hardware"
-					"PowerPC" "PowerPC" $( [ "$PLATFORM" == "PowerPC" ] && echo "on" || echo "off" ) "IBM and Apple hardware (Power and PowerPC)"
-					"SPARC" "Sun SPARC" $( [ "$PLATFORM" == "SPARC" ] && echo "on" || echo "off" ) "SUN Hardware"
-					)
-				menu radiolist "The so-called platform is the name of the hardware architecture. Most people will use x86" &&
-				PLATFORM=$RESULT
-			;;
 			bopt)
 				OPTIONS=(
 					"None" "-O0" $( [ "$BOPT" == "None" ] && echo "on" || echo "off" ) "Only default optimizations"