diff options
author | Doug Schaefer | 2017-11-30 15:33:44 +0000 |
---|---|---|
committer | Doug Schaefer | 2017-11-30 16:11:24 +0000 |
commit | 89d45ef7fd160418d0bbb54fb4488748d6db235d (patch) | |
tree | c0d8406b9c7df532507468bb9430919dfe1f0ef1 | |
parent | d0e528d135360213ac35a1ec4ebd1c792d28b673 (diff) | |
download | org.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/Makefile | 2 | ||||
-rwxr-xr-x | native/org.eclipse.cdt.native.serial/os/win32/x86/serial.dll | bin | 336648 -> 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 6dd2a2fdb93..fb4cf6fcc41 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 Binary files differindex 52ed0cd3dc2..039443b8d23 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 |