Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Mailänder2018-06-10 15:28:39 +0000
committerAlexander Kurtakov2018-06-14 10:54:32 +0000
commit1df1be7c4bb508960a7308b328f53bdbc9cb769f (patch)
treec3fe859ffb762f72746b23ee5e84cb245830c7a6
parentcb5ff646f66f6a9da4c84ae6761934539b3e3e08 (diff)
downloadeclipse.platform.swt-1df1be7c4bb508960a7308b328f53bdbc9cb769f.tar.gz
eclipse.platform.swt-1df1be7c4bb508960a7308b328f53bdbc9cb769f.tar.xz
eclipse.platform.swt-1df1be7c4bb508960a7308b328f53bdbc9cb769f.zip
Bug 393834 - Don't strip debug symbols from SWT
by adhering to CFLAGS set by distributions. Change-Id: I15b734079675b5f18821c712160abc9d3d2c555b Signed-off-by: Matthias Mailänder <matthias@mailaender.name>
-rwxr-xr-xbundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh2
-rw-r--r--bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak3
2 files changed, 3 insertions, 2 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh
index ba16573774..0b178d6908 100755
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh
@@ -72,6 +72,8 @@ cd `dirname $0`
MAKE_TYPE=make
+export CFLAGS='-O -Wall -fPIC'
+
# Determine which OS we are on
if [ "${OS}" = "" ]; then
OS=`uname -s`
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak
index 00f5f725db..9b3c0d4bcd 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/gtk/library/make_linux.mak
@@ -98,7 +98,7 @@ ATK_OBJECTS = swt.o atk.o atk_structs.o atk_custom.o atk_stats.o
WEBKIT_OBJECTS = swt.o webkitgtk.o webkitgtk_structs.o webkitgtk_stats.o webkitgtk_custom.o
GLX_OBJECTS = swt.o glx.o glx_structs.o glx_stats.o
-CFLAGS = -O -Wall \
+CFLAGS := $(CFLAGS) \
-DSWT_VERSION=$(SWT_VERSION) \
$(NATIVE_STATS) \
$(SWT_DEBUG) \
@@ -106,7 +106,6 @@ CFLAGS = -O -Wall \
-DLINUX -DGTK \
-I$(JAVA_HOME)/include \
-I$(JAVA_HOME)/include/linux \
- -fPIC \
${SWT_PTR_CFLAGS}
LFLAGS = -shared -fPIC ${SWT_LFLAGS}

Back to the top