Skip dbgwrapper load on windows for openj9 builds

Signed-off-by: Violeta Sebe <vsebe@ca.ibm.com>
eclipse-openj9 · Oct 16, 2017 · c97a91e · c97a91e
1 parent b36b200
commit c97a91e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/runtime/jcl/cl_se9/module.xml b/runtime/jcl/cl_se9/module.xml
@@ -106,6 +106,9 @@
 		<makefilestubs>
 			<makefilestub data="UMA_ENABLE_ALL_WARNINGS=1"/>
 			<makefilestub data="UMA_TREAT_WARNINGS_AS_ERRORS=1"/>
+			<makefilestub data="ifeq ($(OPENJ9_BUILD),true)"/>
+			<makefilestub data="vm_scar$(UMA_DOT_O) : CFLAGS += -DOPENJ9_BUILD"/>
+			<makefilestub data="endif"/>
 		</makefilestubs>
 
 		<vpaths>

diff --git a/runtime/jcl/common/vm_scar.c b/runtime/jcl/common/vm_scar.c
@@ -298,7 +298,7 @@ scarInit(J9JavaVM * vm)
 	}
 #endif
 
-#if defined(WIN32)
+#if defined(WIN32) && !defined(OPENJ9_BUILD)
 	switch (jclVersion) {
 	case J2SE_17:
 		dbgwrapperStr = "dbgwrapper70";
@@ -318,7 +318,7 @@ scarInit(J9JavaVM * vm)
 		/* If library can not be found, print a warning and proceed anyway as the dependency on this library may have been removed. */
 		j9nls_printf(PORTLIB, J9NLS_WARNING, J9NLS_JCL_WARNING_DLL_COULDNOT_BE_REGISTERED_AS_BOOTSTRAP_LIB, dbgwrapperStr, result);
 	}
-#endif /* defined(WIN32) */
+#endif /* defined(WIN32) && !defined(OPENJ9_BUILD) */
 
 
 #if defined(J9VM_INTERP_MINIMAL_JCL)