--- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse-SWT-PI/gtk/library/make_linux.mak
+++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse-SWT-PI/gtk/library/make_linux.mak
@@ -20,7 +20,7 @@
 #SWT_LIB_DEBUG=1     # to debug glue code in /bundles/org.eclipse.swt/bin/library. E.g os_custom.c:swt_fixed_forall(..)
 # Can be set via environment like: export SWT_LIB_DEBUG=1
 ifdef SWT_LIB_DEBUG
-SWT_DEBUG = -O0 -g3 -ggdb3
+#SWT_DEBUG = -O0 -g3 -ggdb3
 NO_STRIP=1
 endif
 

--- a/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse-SWT-PI/gtk/library/build.sh
+++ b/eclipse.platform.swt/bundles/org.eclipse.swt/Eclipse-SWT-PI/gtk/library/build.sh
@@ -74,7 +74,8 @@
 
 MAKE_TYPE=make
 
-export CFLAGS='-O -Wall -fPIC'
+export CFLAGS="$CFLAGS"	
+OUTPUT_DIR=../../..
 
 # Determine which OS we are on
 if [ "${OS}" = "" ]; then