[GR-46465] Make it easy to add to create a debug builds of our native libs

PullRequest: graalpython/2804

Author: timfel

mx.graalpython/mx_graalpython.py

@@ -51,6 +51,7 @@
 import mx
 import mx_benchmark
 import mx_gate
+import mx_native
 import mx_unittest
 import mx_sdk
 import mx_subst
@@ -103,6 +104,15 @@ def is_collectiong_coverage():
 if os.environ.get("CI") == "true" and not os.environ.get("GRAALPYTEST_FAIL_FAST"):
     os.environ["GRAALPYTEST_FAIL_FAST"] = "true"
 
+
+def wants_debug_build(flags=os.environ.get("CFLAGS", "")):
+    return any(x in flags for x in ["-g", "-ggdb", "-ggdb3"])
+
+
+if wants_debug_build():
+    mx_native.DefaultNativeProject.cflags = property(lambda self: self._cflags + ["-fPIC", "-ggdb3"])
+
+
 def _sibling(filename):
     return os.path.join(os.path.dirname(__file__), filename)
 
@@ -2447,14 +2457,20 @@ def run(self, args, env=None, cwd=None, **kwargs):
         # besides keeping custom sysroot, since our toolchain forwards to the system headers
         for var in ["CC", "CFLAGS", "LDFLAGS"]:
             value = env.pop(var, None)
-            if value and "--sysroot" in value:
-                seen_sysroot = False
-                for element in shlex.split(value):
-                    if element == "--sysroot":
-                        seen_sysroot = True
-                    elif seen_sysroot:
-                        env[var] = f"--sysroot {element}"
-                        break
+            new_value = []
+            if value:
+                if wants_debug_build(value):
+                    new_value.append("-ggdb3")
+                if "--sysroot" in value:
+                    seen_sysroot = False
+                    for element in shlex.split(value):
+                        if element == "--sysroot":
+                            seen_sysroot = True
+                        elif seen_sysroot:
+                            new_value.append(f"--sysroot {element}")
+                            break
+            if new_value:
+                env[var] = " ".join(new_value)
         return super().run(args, env=env, cwd=cwd, **kwargs)
 
     def _dev_headers_dir(self):

mx.graalpython/suite.py

@@ -494,7 +494,7 @@
             "use_jdk_headers": True, # the generated JNI header includes jni.h
             "cflags": [
                 "-DHPY_UNIVERSAL_ABI", "-DNDEBUG",
-                "-g", "-O3", "-Werror",
+                "-O3", "-Werror",
                 "-I\"<path:com.oracle.graal.python.cext>/include\"",
                 "-I\"<path:com.oracle.graal.python.cext>/include/internal\"",
                 "-I\"<path:com.oracle.graal.python.cext>/src\"",