Fix Windows build

fangerer · fangerer · commit 2f4da628ee61 · 2023-06-30T16:21:10.000+02:00
diff --git a/graalpython/com.oracle.graal.python.cext/CMakeLists.txt b/graalpython/com.oracle.graal.python.cext/CMakeLists.txt
@@ -35,6 +35,10 @@ function(require_var var)
     endif()
 endfunction()
 
+if(MSVC)
+    message(FATAL_ERROR "C API cannot be built with MSVC")
+endif()
+
 if(WIN32)
     require_var(GRAALVM_LLVM_LIB_DIR)
 endif()
@@ -52,27 +56,17 @@ set(TARGET_LIBPYTHON "python-${LLVM_MODE}")
 # common variables and compile/link options (for all build targets)
 ######################################################################
 
-if(NOT WIN32)
-    set(CFLAGS_WARNINGS -Werror -Wno-int-to-pointer-cast -Wno-int-conversion -Wno-void-pointer-to-int-cast
-                        -Wno-incompatible-pointer-types-discards-qualifiers -Wno-pointer-type-mismatch
-                        -Wno-braced-scalar-init -Wno-deprecated-declarations)
-else()
-    set(CFLAGS_WARNINGS)
-endif()
+set(CFLAGS_WARNINGS -Wno-int-to-pointer-cast -Wno-int-conversion -Wno-void-pointer-to-int-cast
+                    -Wno-incompatible-pointer-types-discards-qualifiers -Wno-pointer-type-mismatch
+                    -Wno-braced-scalar-init -Wno-deprecated-declarations)
 
 # preprocessor defines for all platforms
 add_compile_definitions(
     NDEBUG
     GRAALVM_PYTHON_LLVM
-    Py_BUILD_CORE_MODULE
 )
 
 if(WIN32)
-    add_compile_options(
-        /Z7
-        /O2
-        /WX
-    )
     add_compile_definitions(
         MS_WINDOWS
         Py_ENABLE_SHARED
@@ -156,9 +150,14 @@ function(native_module name core src_files)
         target_compile_definitions(${name} PRIVATE Py_BUILD_CORE)
         target_include_directories(${name} PRIVATE "${SRC_DIR}/include/internal")
     endif()
-    set_target_properties(${name} PROPERTIES SUFFIX "${GRAALPY_EXT}")
-    set_target_properties(${name} PROPERTIES PREFIX "")
+    target_compile_definitions(${name} PRIVATE Py_BUILD_CORE_MODULE)
+    set_target_properties(${name} PROPERTIES SUFFIX "${GRAALPY_EXT}"
+                                             PREFIX "")
     target_sources(${name} PRIVATE ${src_files})
+    if(WIN32)
+        target_link_directories(${name} PRIVATE ${CMAKE_BINARY_DIR})
+        target_link_libraries(${name} PRIVATE ${TARGET_LIBPYTHON})
+    endif()
     install(TARGETS ${name} DESTINATION "bin/modules")
 endfunction()
 
@@ -222,6 +221,7 @@ target_include_directories(${TARGET_LIBPYTHON} PRIVATE
 # target-specific compile and link options
 ######################################################################
 
+target_compile_definitions(${TARGET_LIBPYTHON} PRIVATE Py_BUILD_CORE)
 target_compile_options(${TARGET_LIBPYTHON} PRIVATE ${CFLAGS_WARNINGS})
 
 if(WIN32)
diff --git a/graalpython/com.oracle.graal.python.cext/include/pyconfig.h b/graalpython/com.oracle.graal.python.cext/include/pyconfig.h
@@ -115,8 +115,6 @@
 #define CHAR_BIT __CHAR_BIT__
 #endif
 // #define Py_LIMITED_API 1
-#define _Py_BEGIN_SUPPRESS_IPH
-#define _Py_END_SUPPRESS_IPH
 // END TRUFFLE DEFS
 
 #define HAVE_ACOSH 1
diff --git a/graalpython/com.oracle.graal.python.cext/src/capi.c b/graalpython/com.oracle.graal.python.cext/src/capi.c
@@ -103,6 +103,7 @@ void PyTruffle_Tuple_Dealloc(PyTupleObject* tuple);
 PyAPI_DATA(PyTypeObject) _PyExc_BaseException;
 PyAPI_DATA(PyTypeObject) _PyExc_StopIteration;
 
+PyTypeObject PyType_Type = 					PY_TRUFFLE_TYPE_WITH_ITEMSIZE("type", &PyType_Type, Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC | Py_TPFLAGS_BASETYPE | Py_TPFLAGS_TYPE_SUBCLASS, sizeof(PyHeapTypeObject), sizeof(PyMemberDef));
 PyTypeObject _PyExc_BaseException = 		PY_TRUFFLE_TYPE("BaseException", &PyType_Type, Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC | Py_TPFLAGS_BASETYPE | Py_TPFLAGS_BASE_EXC_SUBCLASS, sizeof(PyBaseExceptionObject));
 PyTypeObject _PyExc_StopIteration = 		PY_TRUFFLE_TYPE("StopIteration", &PyType_Type, Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC | Py_TPFLAGS_BASETYPE | Py_TPFLAGS_BASE_EXC_SUBCLASS, sizeof(PyStopIterationObject));
 PyTypeObject _PyNamespace_Type = 			PY_TRUFFLE_TYPE("SimpleNamespace", &PyType_Type, Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC | Py_TPFLAGS_BASETYPE, sizeof(_PyNamespaceObject));
@@ -147,7 +148,6 @@ PyTypeObject PyStaticMethod_Type = 			PY_TRUFFLE_TYPE("staticmethod", &PyType_Ty
 PyTypeObject PySuper_Type = 				PY_TRUFFLE_TYPE("super", &PyType_Type, Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC | Py_TPFLAGS_BASETYPE, sizeof(superobject));
 PyTypeObject PyTraceBack_Type = 			PY_TRUFFLE_TYPE("traceback", &PyType_Type, Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC, sizeof(PyTypeObject));
 PyTypeObject PyTuple_Type = 				PY_TRUFFLE_TYPE_GENERIC("tuple", &PyType_Type, Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC | Py_TPFLAGS_BASETYPE | Py_TPFLAGS_TUPLE_SUBCLASS | _Py_TPFLAGS_MATCH_SELF | Py_TPFLAGS_SEQUENCE, sizeof(PyTupleObject) - sizeof(PyObject *), sizeof(PyObject *), PyTruffle_Tuple_Alloc, (destructor)PyTruffle_Tuple_Dealloc, 0, 0);
-PyTypeObject PyType_Type = 					PY_TRUFFLE_TYPE_WITH_ITEMSIZE("type", &PyType_Type, Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC | Py_TPFLAGS_BASETYPE | Py_TPFLAGS_TYPE_SUBCLASS, sizeof(PyHeapTypeObject), sizeof(PyMemberDef));
 PyTypeObject PyUnicode_Type = 				PY_TRUFFLE_TYPE("str", &PyType_Type, Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE | Py_TPFLAGS_UNICODE_SUBCLASS | _Py_TPFLAGS_MATCH_SELF, sizeof(PyUnicodeObject));
 /* NOTE: we use the same Python type (namely 'PBuiltinFunction') for 'wrapper_descriptor' as for 'method_descriptor'; so the flags must be the same! */
 PyTypeObject PyWrapperDescr_Type = 			PY_TRUFFLE_TYPE("wrapper_descriptor", &PyType_Type, Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC | Py_TPFLAGS_METHOD_DESCRIPTOR, sizeof(PyWrapperDescrObject));
diff --git a/graalpython/com.oracle.graal.python.hpy.llvm/CMakeLists.txt b/graalpython/com.oracle.graal.python.hpy.llvm/CMakeLists.txt
@@ -101,16 +101,30 @@ target_compile_definitions(${TARGET_LIB} PRIVATE
     HPY_UNIVERSAL_ABI
     NDEBUG
     GRAALVM_PYTHON_LLVM
+    Py_BUILD_CORE
 )
 
 if(WIN32)
     require_var(GRAALVM_LLVM_LIB_DIR)
     target_link_directories(${TARGET_LIB} PRIVATE ${GRAALVM_LLVM_LIB_DIR})
-    target_link_libraries(${TARGET_LIB} graalvm-llvm)
+    target_link_libraries(${TARGET_LIB} PRIVATE graalvm-llvm)
+    # Following defines are for 'Python.h'. Since HPy includes it, we need them.
+    target_compile_definitions(${TARGET_LIB} PRIVATE
+        MS_WINDOWS
+        Py_ENABLE_SHARED
+        HAVE_DECLSPEC_DLL
+    )
+endif()
+
+if(MSVC)
     target_compile_options(${TARGET_LIB} PRIVATE /Z7 /O2 /WX)
 else()
+    if(NOT WIN32)
+        target_compile_options(${TARGET_LIB} PRIVATE
+            -Werror
+        )
+    endif()
     target_compile_options(${TARGET_LIB} PRIVATE
-        -Werror
         -Wno-int-to-pointer-cast
         -Wno-int-conversion
         -Wno-void-pointer-to-int-cast
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/CApiContext.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/CApiContext.java
@@ -659,7 +659,7 @@ public static CApiContext ensureCapiWasLoaded(Node node, PythonContext context,
 
             TruffleFile homePath = env.getInternalTruffleFile(context.getCAPIHome().toJavaStringUncached());
             // e.g. "libpython-native.so"
-            String libName = context.getLLVMSupportExt("libpython");
+            String libName = context.getLLVMSupportExt("python");
             TruffleFile capiFile = homePath.resolve(libName);
             try {
                 SourceBuilder capiSrcBuilder = Source.newBuilder(J_LLVM_LANGUAGE, capiFile);
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/hpy/llvm/GraalHPyLLVMContext.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/hpy/llvm/GraalHPyLLVMContext.java
@@ -236,7 +236,7 @@ public static Object loadLLVMLibrary(PythonContext context) throws IOException {
         Env env = context.getEnv();
         TruffleFile homePath = env.getInternalTruffleFile(context.getCAPIHome().toJavaStringUncached());
         // e.g. "libhpy-native.so"
-        TruffleFile capiFile = homePath.resolve(context.getLLVMSupportExt("libhpy"));
+        TruffleFile capiFile = homePath.resolve(context.getLLVMSupportExt("hpy"));
         try {
             LOGGER.fine("Loading HPy LLVM backend from " + capiFile);
             SourceBuilder capiSrcBuilder = Source.newBuilder(J_LLVM_LANGUAGE, capiFile);
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/StringLiterals.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/StringLiterals.java
@@ -162,12 +162,14 @@ public abstract class StringLiterals {
     public static final String J_TYPE_ID = "_typeid";
     public static final TruffleString T_TYPE_ID = tsLiteral(J_TYPE_ID);
 
+    public static final String J_LIB_PREFIX = "lib";
+
     public static final String J_EXT_SO = ".so";
     public static final TruffleString T_EXT_SO = tsLiteral(J_EXT_SO);
     public static final String J_EXT_PYD = ".pyd";
     public static final TruffleString T_EXT_PYD = tsLiteral(J_EXT_PYD);
     public static final String J_EXT_DYLIB = ".dylib";
-    public static final TruffleString T_EXT_DYLIB = tsLiteral(J_EXT_DYLIB);
+    public static final String J_EXT_DLL = ".dll";
 
     public static final String J_NATIVE = "native";
     public static final TruffleString T_NATIVE = tsLiteral(J_NATIVE);
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/NFIBz2Support.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/NFIBz2Support.java
@@ -145,7 +145,7 @@ public String signature() {
         }
     }
 
-    private static final String SUPPORTING_NATIVE_LIB_NAME = "libbz2support";
+    private static final String SUPPORTING_NATIVE_LIB_NAME = "bz2support";
 
     private final PythonContext pythonContext;
     private final NativeLibrary.TypedNativeLibrary<Bz2NativeFunctions> typedNativeLib;
@@ -155,7 +155,7 @@ public String signature() {
     private NFIBz2Support(PythonContext context, NativeLibrary.NFIBackend backend, String noNativeAccessHelp) {
         if (context.isNativeAccessAllowed()) {
             this.pythonContext = context;
-            this.typedNativeLib = NativeLibrary.create(SUPPORTING_NATIVE_LIB_NAME + PythonContext.getSupportExt(), Bz2NativeFunctions.values(),
+            this.typedNativeLib = NativeLibrary.create(PythonContext.getSupportLibName(SUPPORTING_NATIVE_LIB_NAME), Bz2NativeFunctions.values(),
                             backend, noNativeAccessHelp, false);
             this.available = true;
         } else {
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/NFILZMASupport.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/NFILZMASupport.java
@@ -285,7 +285,7 @@ public String signature() {
         }
     }
 
-    private static final String SUPPORTING_NATIVE_LIB_NAME = "liblzmasupport";
+    private static final String SUPPORTING_NATIVE_LIB_NAME = "lzmasupport";
 
     private final PythonContext pythonContext;
     private final NativeLibrary.TypedNativeLibrary<LZMANativeFunctions> typedNativeLib;
@@ -295,7 +295,7 @@ public String signature() {
     private NFILZMASupport(PythonContext context, NativeLibrary.NFIBackend backend, String noNativeAccessHelp) {
         if (context.isNativeAccessAllowed()) {
             this.pythonContext = context;
-            this.typedNativeLib = NativeLibrary.create(SUPPORTING_NATIVE_LIB_NAME + PythonContext.getSupportExt(), LZMANativeFunctions.values(),
+            this.typedNativeLib = NativeLibrary.create(PythonContext.getSupportLibName(SUPPORTING_NATIVE_LIB_NAME), LZMANativeFunctions.values(),
                             backend, noNativeAccessHelp, true);
             this.available = true;
         } else {
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/NFIPosixSupport.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/NFIPosixSupport.java
@@ -126,7 +126,7 @@
  */
 @ExportLibrary(PosixSupportLibrary.class)
 public final class NFIPosixSupport extends PosixSupport {
-    private static final String SUPPORTING_NATIVE_LIB_NAME = "libposix";
+    private static final String SUPPORTING_NATIVE_LIB_NAME = "posix";
 
     private static final int UNAME_BUF_LENGTH = 256;
     private static final int DIRENT_NAME_BUF_LENGTH = 256;
@@ -336,7 +336,7 @@ public byte callByte(NFIPosixSupport posix, PosixNativeFunction function, Object
         // Temporary - will be replaced with something else when we move this to Truffle
         private static String getLibPath(PythonContext context) {
             CompilerAsserts.neverPartOfCompilation();
-            String libPythonName = NFIPosixSupport.SUPPORTING_NATIVE_LIB_NAME + PythonContext.getSupportExt();
+            String libPythonName = PythonContext.getSupportLibName(NFIPosixSupport.SUPPORTING_NATIVE_LIB_NAME);
             TruffleFile homePath = context.getEnv().getInternalTruffleFile(context.getCAPIHome().toJavaStringUncached());
             TruffleFile file = homePath.resolve(libPythonName);
             return file.getPath();
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/NFIZlibSupport.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/NFIZlibSupport.java
@@ -258,7 +258,7 @@ public String signature() {
         }
     }
 
-    private static final String SUPPORTING_NATIVE_LIB_NAME = "libzsupport";
+    private static final String SUPPORTING_NATIVE_LIB_NAME = "zsupport";
 
     private final PythonContext pythonContext;
     private final NativeLibrary.TypedNativeLibrary<ZlibNativeFunctions> typedNativeLib;
@@ -268,7 +268,7 @@ public String signature() {
     private NFIZlibSupport(PythonContext context, NativeLibrary.NFIBackend backend, String noNativeAccessHelp) {
         if (context.isNativeAccessAllowed()) {
             this.pythonContext = context;
-            this.typedNativeLib = NativeLibrary.create(SUPPORTING_NATIVE_LIB_NAME + PythonContext.getSupportExt(),
+            this.typedNativeLib = NativeLibrary.create(PythonContext.getSupportLibName(SUPPORTING_NATIVE_LIB_NAME),
                             ZlibNativeFunctions.values(), backend, noNativeAccessHelp, true);
             this.available = true;
         } else {
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/PythonContext.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/PythonContext.java
@@ -39,9 +39,10 @@
 import static com.oracle.graal.python.nodes.SpecialAttributeNames.T___ANNOTATIONS__;
 import static com.oracle.graal.python.nodes.SpecialAttributeNames.T___FILE__;
 import static com.oracle.graal.python.nodes.SpecialMethodNames.T_INSERT;
+import static com.oracle.graal.python.nodes.StringLiterals.J_EXT_DLL;
 import static com.oracle.graal.python.nodes.StringLiterals.J_EXT_DYLIB;
-import static com.oracle.graal.python.nodes.StringLiterals.J_EXT_PYD;
 import static com.oracle.graal.python.nodes.StringLiterals.J_EXT_SO;
+import static com.oracle.graal.python.nodes.StringLiterals.J_LIB_PREFIX;
 import static com.oracle.graal.python.nodes.StringLiterals.J_LLVM_LANGUAGE;
 import static com.oracle.graal.python.nodes.StringLiterals.J_NATIVE;
 import static com.oracle.graal.python.nodes.StringLiterals.T_DASH;
@@ -98,6 +99,7 @@
 
 import com.oracle.graal.python.PythonLanguage;
 import com.oracle.graal.python.builtins.Python3Core;
+import com.oracle.graal.python.builtins.PythonOS;
 import com.oracle.graal.python.builtins.modules.ImpModuleBuiltins;
 import com.oracle.graal.python.builtins.modules.MathGuards;
 import com.oracle.graal.python.builtins.modules.ctypes.CtypesModuleBuiltins.CtypesThreadState;
@@ -196,16 +198,23 @@ public final class PythonContext extends Python3Core {
     public final HandleContext nativeContext = new HandleContext();
     private volatile boolean finalizing;
 
-    private static String getJniSoExt() {
-        if (getPythonOS() == PLATFORM_DARWIN) {
-            return ".dylib";
-        } else if (getPythonOS() == PLATFORM_WIN32) {
-            return ".dll";
-        }
-        return ".so";
+    @TruffleBoundary
+    public static String getSupportLibName(PythonOS os, String libName) {
+        // note: this should be aligned with MX's "lib" substitution
+        return switch (os) {
+            case PLATFORM_LINUX, PLATFORM_FREEBSD, PLATFORM_SUNOS -> J_LIB_PREFIX + libName + J_EXT_SO;
+            case PLATFORM_DARWIN -> J_LIB_PREFIX + libName + J_EXT_DYLIB;
+            case PLATFORM_WIN32 -> libName + J_EXT_DLL;
+            default -> libName;
+        };
+    }
+
+    @TruffleBoundary
+    public static String getSupportLibName(String libName) {
+        return getSupportLibName(getPythonOS(), libName);
     }
 
-    public static final String J_PYTHON_JNI_LIBRARY_NAME = System.getProperty("python.jni.library", "libpythonjni" + getJniSoExt());
+    public static final String J_PYTHON_JNI_LIBRARY_NAME = System.getProperty("python.jni.library", getSupportLibName("pythonjni"));
 
     /**
      * An enum of events which can currently be traced using python's tracing
@@ -2480,24 +2489,16 @@ public long getDeserializationId(TruffleString fileName) {
         return deserializationId.computeIfAbsent(fileName, f -> new AtomicLong()).incrementAndGet();
     }
 
-    @TruffleBoundary
-    public static String getSupportExt() {
-        return switch (getPythonOS()) {
-            case PLATFORM_DARWIN -> J_EXT_DYLIB;
-            case PLATFORM_WIN32 -> J_EXT_PYD;
-            default -> J_EXT_SO;
-        };
-    }
-
     @TruffleBoundary
     public String getLLVMSupportExt(String libName) {
         LanguageInfo llvmInfo = env.getInternalLanguages().get(J_LLVM_LANGUAGE);
         Toolchain toolchain = env.lookup(llvmInfo, Toolchain.class);
         String toolchainIdentifier = toolchain.getIdentifier();
         if (J_NATIVE.equals(toolchainIdentifier)) {
-            return libName + '-' + J_NATIVE + PythonContext.getSupportExt();
+            return PythonContext.getSupportLibName(libName + '-' + J_NATIVE);
         }
-        return libName + '-' + toolchainIdentifier + J_EXT_SO;
+        // if not native, we always assume a Linux-like system
+        return PythonContext.getSupportLibName(PythonOS.PLATFORM_LINUX, libName + '-' + toolchainIdentifier);
     }
 
     @TruffleBoundary
diff --git a/mx.graalpython/mx_graalpython.py b/mx.graalpython/mx_graalpython.py
@@ -1631,14 +1631,16 @@ def graalpy_ext(llvm_mode, **kwargs):
         # (see also: 'PythonUtils.getPythonArch')
         arch = 'x86_64'
 
-    # not ".dylib", similar to CPython:
+    # 'pyos' also needs to be compatible with CPython's designation.
+    # See class 'com.oracle.graal.python.builtins.PythonOS'
+    # In this case, we can just use 'sys.platform' of the Python running MX.
+    pyos = sys.platform
+
+    # on Windows we use '.pyd' else '.so' but never '.dylib' (similar to CPython):
     # https://github.com/python/cpython/issues/37510
-    if os == 'windows':
-        ext = 'pyd'
-    else:
-        ext = 'so'
+    ext = 'pyd' if os == 'windows' else 'so'
 
-    return f'.graalpy{GRAAL_VERSION_NODOT}-{PYTHON_VERSION_NODOT}-{llvm_mode}-{arch}-{os}.{ext}'
+    return f'.graalpy{GRAAL_VERSION_NODOT}-{PYTHON_VERSION_NODOT}-{llvm_mode}-{arch}-{pyos}.{ext}'
 
 
 mx_subst.path_substitutions.register_with_arg('suite', _get_suite_dir)
diff --git a/mx.graalpython/suite.py b/mx.graalpython/suite.py
@@ -608,23 +608,28 @@
                 "sulong:SULONG_BOOTSTRAP_TOOLCHAIN",
                 "sulong:SULONG_LEGACY",
             ],
-            "cmakeConfig" : {
-                "LLVM_MODE" : "native",
-                "GRAALVM_HPY_INCLUDE_DIR" : "<path:com.oracle.graal.python.hpy.llvm>/include",
-                "GRAALVM_PYTHON_INCLUDE_DIR" : "<path:com.oracle.graal.python.cext>/include",
-                "TRUFFLE_H_INC": "<path:SULONG_LEGACY>/include",
-                "CMAKE_C_COMPILER": "<toolchainGetToolPath:native,CC>",
-            },
             "os_arch": {
                 "windows": {
                     "<others>": {
-                        # "/Z7", "/O2", "/WX", # cflags to replace -g -O3 -Werror
-                        "defaultBuild": False,
+                        "cmakeConfig" : {
+                            "GRAALVM_LLVM_LIB_DIR" : "<path:SULONG_NATIVE_HOME>/native/lib",
+                            "LLVM_MODE" : "native",
+                            "GRAALVM_HPY_INCLUDE_DIR" : "<path:com.oracle.graal.python.hpy.llvm>/include",
+                            "GRAALVM_PYTHON_INCLUDE_DIR" : "<path:com.oracle.graal.python.cext>/include",
+                            "TRUFFLE_H_INC": "<path:SULONG_LEGACY>/include",
+                            "CMAKE_C_COMPILER": "<toolchainGetToolPath:native,CC>",
+                        },
                     },
                 },
                 "<others>": {
                     "<others>": {
-                        "defaultBuild" : True,
+                        "cmakeConfig" : {
+                            "LLVM_MODE" : "native",
+                            "GRAALVM_HPY_INCLUDE_DIR" : "<path:com.oracle.graal.python.hpy.llvm>/include",
+                            "GRAALVM_PYTHON_INCLUDE_DIR" : "<path:com.oracle.graal.python.cext>/include",
+                            "TRUFFLE_H_INC": "<path:SULONG_LEGACY>/include",
+                            "CMAKE_C_COMPILER": "<toolchainGetToolPath:native,CC>",
+                        },
                     },
                 },
             },
@@ -949,7 +954,7 @@
                             "./lib-graalpython/": [
                                 "file:graalpython/lib-graalpython/*",
                                 "extracted-dependency:GRAALPYTHON_NATIVE_LIBS/*",
-                                "file:com.oracle.graal.python.cext/CEXT-WINDOWS-README.md",
+                                "file:graalpython/com.oracle.graal.python.cext/CEXT-WINDOWS-README.md",
                             ],
                             "./lib-graalpython/modules/graalpy_virtualenv": [
                                 "file:graalpy_virtualenv/graalpy_virtualenv",
