--- eclipse-sdk-3.5.1.ebuild	2009-12-10 03:19:32.000000000 +0900
+++ eclipse-sdk-3.5.1.ebuild	2009-12-14 00:43:22.000000000 +0900
@@ -10,7 +10,7 @@ 
 # and push them upstream
 JAVA_PKG_BSFIX="off"
 
-inherit java-pkg-2 java-ant-2 check-reqs
+inherit java-pkg-2 java-ant-2 check-reqs toolchain-funcs
 
 BUILD_ID="R3_5_1"
 ECLIPSE_BUILD_VER="R0_4_0"
@@ -98,6 +98,20 @@ 
 	sed -e 's|/usr/lib/jvm/java/jre/lib/rt\.jar:.*$|'"$(java-config --runtime)"'|' \
 			-i {,pde}build.properties || die
 
+	# fix up hardcoded gcc
+	sed -i -e "s:gcc:$(tc-getCC):" \
+		"${buildDir}"/features/org.eclipse.equinox.executable/library/motif/make_linux.mak \
+		"${buildDir}"/features/org.eclipse.equinox.executable/library/gtk/make_linux.mak \
+		"${buildDir}"/features/org.eclipse.equinox.executable/.cproject \
+		"${buildDir}"/features/org.eclipse.equinox.executable/.cdtproject \
+		"${buildDir}"/plugins/org.eclipse.update.core.linux/src/build.xml \
+		"${buildDir}"/plugins/org.eclipse.swt/Eclipse\ SWT\ PI/motif/library/make_linux.mak \
+		"${buildDir}"/plugins/org.eclipse.swt/Eclipse\ SWT\ PI/gtk/library/build.sh \
+		"${buildDir}"/plugins/org.eclipse.equinox.launcher/.cproject \
+		"${buildDir}"/plugins/org.eclipse.equinox.launcher/.cdtproject \
+		"${buildDir}"/plugins/org.eclipse.core.net/natives/unix/linux/makefile \
+		"${buildDir}"/plugins/org.eclipse.core.filesystem/natives/unix/linux/Makefile || die
+
 	# fix up arch specifications if we're x86_64
 	if use amd64 ; then
 		sed -e 's/x86/\0_64/' -i "${buildDir}"/buildConfigs/eclipse-build-config/build.properties || die