Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonah Graham2020-08-18 12:19:30 +0000
committerJonah Graham2020-08-18 12:20:12 +0000
commit8c1be591ff1acbdf4e41db1a6a8b9a49eb30871a (patch)
tree126c27556a121cc3b882692488b90c5b9486672e /core/org.eclipse.cdt.core.native
parent786ae3ce2b68a06e101e519a372c624d8defbfd5 (diff)
downloadorg.eclipse.cdt-8c1be591ff1acbdf4e41db1a6a8b9a49eb30871a.tar.gz
org.eclipse.cdt-8c1be591ff1acbdf4e41db1a6a8b9a49eb30871a.tar.xz
org.eclipse.cdt-8c1be591ff1acbdf4e41db1a6a8b9a49eb30871a.zip
Bug 521515: Build pty.dll in docker (fixup)
Fixes for items identified by Torbjörn in my changes to commit 2d03236339d65437cb6138c61b3e7df0700eb6d0 Change-Id: I51f289f731062b4a43bb041d25cd08467014151e
Diffstat (limited to 'core/org.eclipse.cdt.core.native')
-rw-r--r--core/org.eclipse.cdt.core.native/native_src/Makefile2
-rw-r--r--core/org.eclipse.cdt.core.native/src/org/eclipse/cdt/utils/pty/PTY.java4
2 files changed, 3 insertions, 3 deletions
diff --git a/core/org.eclipse.cdt.core.native/native_src/Makefile b/core/org.eclipse.cdt.core.native/native_src/Makefile
index 5815c72d446..19205a65869 100644
--- a/core/org.eclipse.cdt.core.native/native_src/Makefile
+++ b/core/org.eclipse.cdt.core.native/native_src/Makefile
@@ -89,7 +89,7 @@ $(OS_DIR_WIN32_X86_64)/pty.dll: win/pty.cpp win/pty_dllmain.cpp
x86_64-w64-mingw32-g++ -o $@ -Iinclude -Iwin/include -I"$(JAVA_HOME)/include" -I"$(JAVA_HOME)/include/win32" \
-DUNICODE \
win/pty.cpp win/pty_dllmain.cpp \
- -Wl,--kill-at --shared -L$(OS_DIR_WIN32_X86_64) -lwinpty # -static-libstdc++ -static-libgcc
+ -Wl,--kill-at --shared -L$(OS_DIR_WIN32_X86_64) -lwinpty -static-libstdc++ -static-libgcc
# Linux x86_64
$(OS_DIR_LINUX_X86_64)/libspawner.so: unix/spawner.c unix/io.c unix/exec_unix.c unix/exec_pty.c unix/openpty.c unix/pfind.c
diff --git a/core/org.eclipse.cdt.core.native/src/org/eclipse/cdt/utils/pty/PTY.java b/core/org.eclipse.cdt.core.native/src/org/eclipse/cdt/utils/pty/PTY.java
index fbe1f377665..55431dee60c 100644
--- a/core/org.eclipse.cdt.core.native/src/org/eclipse/cdt/utils/pty/PTY.java
+++ b/core/org.eclipse.cdt.core.native/src/org/eclipse/cdt/utils/pty/PTY.java
@@ -262,7 +262,8 @@ public class PTY {
static {
try {
- if (Platform.OS_WIN32.equals(Platform.getOS())) {
+ isWinPTY = Platform.OS_WIN32.equals(Platform.getOS());
+ if (isWinPTY) {
// When we used to build with VC++ we used DelayLoadDLLs (See Gerrit 167674 and Bug 521515) so that the winpty
// could be found. When we ported to mingw we didn't port across this feature because it was simpler to just
// manually load winpty first.
@@ -270,7 +271,6 @@ public class PTY {
}
System.loadLibrary("pty"); //$NON-NLS-1$
hasPTY = true;
- isWinPTY = Platform.OS_WIN32.equals(Platform.getOS());
// on windows console mode is not supported except for experimental use
// to enable it, set system property org.eclipse.cdt.core.winpty_console_mode=true
isConsoleModeSupported = !isWinPTY || Boolean.getBoolean("org.eclipse.cdt.core.winpty_console_mode"); //$NON-NLS-1$

Back to the top