Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDoug Schaefer2017-11-30 10:33:44 -0500
committerDoug Schaefer2017-11-30 11:11:24 -0500
commit89d45ef7fd160418d0bbb54fb4488748d6db235d (patch)
treec0d8406b9c7df532507468bb9430919dfe1f0ef1
parentd0e528d135360213ac35a1ec4ebd1c792d28b673 (diff)
downloadorg.eclipse.cdt-89d45ef7fd160418d0bbb54fb4488748d6db235d.tar.gz
org.eclipse.cdt-89d45ef7fd160418d0bbb54fb4488748d6db235d.tar.xz
org.eclipse.cdt-89d45ef7fd160418d0bbb54fb4488748d6db235d.zip
Bug 515305 - Fix 32-bit serial port dll
It was depending on the libgcc dll. Changed to link it statically. Change-Id: Ifd8610c78d3861f3c4cd82fde3bb47f5c3afe594
-rw-r--r--native/org.eclipse.cdt.native.serial/jni/Makefile2
-rwxr-xr-xnative/org.eclipse.cdt.native.serial/os/win32/x86/serial.dllbin336648 -> 337496 bytes
2 files changed, 1 insertions, 1 deletions
diff --git a/native/org.eclipse.cdt.native.serial/jni/Makefile b/native/org.eclipse.cdt.native.serial/jni/Makefile
index 6dd2a2fdb9..fb4cf6fcc4 100644
--- a/native/org.eclipse.cdt.native.serial/jni/Makefile
+++ b/native/org.eclipse.cdt.native.serial/jni/Makefile
@@ -43,7 +43,7 @@ rebuild: clean all
$(OS_DIR)/win32/x86/serial.dll: serial.c
mkdir -p $(dir $@)
- i686-w64-mingw32-gcc -Wl,--kill-at -I"$(JAVA_HOME)/include" -I"$(JAVA_HOME)/include/win32" -shared -o $@ serial.c
+ i686-w64-mingw32-gcc -Wl,--kill-at -static-libgcc -I"$(JAVA_HOME)/include" -I"$(JAVA_HOME)/include/win32" -shared -o $@ serial.c
$(OS_DIR)/win32/x86_64/serial.dll: serial.c
mkdir -p $(dir $@)
diff --git a/native/org.eclipse.cdt.native.serial/os/win32/x86/serial.dll b/native/org.eclipse.cdt.native.serial/os/win32/x86/serial.dll
index 52ed0cd3dc..039443b8d2 100755
--- a/native/org.eclipse.cdt.native.serial/os/win32/x86/serial.dll
+++ b/native/org.eclipse.cdt.native.serial/os/win32/x86/serial.dll
Binary files differ

Back to the top