Remove more debug flags from native library builds

Author: timfel

graalpython/com.oracle.graal.python.hpy.llvm/CMakeLists.txt

@@ -97,8 +97,6 @@ target_include_directories(${TARGET_LIB} PRIVATE
     "${TRUFFLE_H_INC}"
 )
 
-add_compile_options(-ffile-prefix-map=${GRAALPY_PARENT_DIR}=.)
-
 target_compile_definitions(${TARGET_LIB} PRIVATE
     HPY_ABI_HYBRID
     NDEBUG
@@ -119,14 +117,15 @@ if(WIN32)
 endif()
 
 if(MSVC)
-    target_compile_options(${TARGET_LIB} PRIVATE /Z7 /O2 /WX)
+    target_compile_options(${TARGET_LIB} PRIVATE /O2 /WX)
 else()
     if(NOT WIN32)
         target_compile_options(${TARGET_LIB} PRIVATE
             -Werror
         )
     endif()
     target_compile_options(${TARGET_LIB} PRIVATE
+        -ffile-prefix-map=${GRAALPY_PARENT_DIR}=.
         -Wno-int-to-pointer-cast
         -Wno-int-conversion
         -Wno-void-pointer-to-int-cast

graalpython/python-libbz2/CMakeLists.txt

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2023, Oracle and/or its affiliates.
+# Copyright (c) 2023, 2024, Oracle and/or its affiliates.
 #
 # All rights reserved.
 #
@@ -44,9 +44,9 @@ add_library(${TARGET_BZIP2SUPPORT} SHARED)
 target_compile_definitions(${TARGET_BZIP2SUPPORT} PRIVATE NDEBUG)
 
 if(WIN32)
-    target_compile_options(${TARGET_BZIP2SUPPORT} PRIVATE /Z7 /O2 /WX)
+    target_compile_options(${TARGET_BZIP2SUPPORT} PRIVATE /O2 /WX)
 else()
-    target_compile_options(${TARGET_BZIP2SUPPORT} PRIVATE -Wall -Werror -O3 -g)
+    target_compile_options(${TARGET_BZIP2SUPPORT} PRIVATE -Wall -Werror -O3)
 endif()
 
 # don't install into the system but into the MX project's output dir

graalpython/python-libbz2/libbz2.cmake

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2023, Oracle and/or its affiliates.
+# Copyright (c) 2023, 2024, Oracle and/or its affiliates.
 #
 # All rights reserved.
 #
@@ -57,9 +57,9 @@ set_target_properties(${TARGET_LIBBZ2} PROPERTIES POSITION_INDEPENDENT_CODE TRUE
 target_compile_definitions(${TARGET_LIBBZ2} PRIVATE _FILE_OFFSET_BITS=64)
 
 if(WIN32)
-    target_compile_options(${TARGET_LIBBZ2} PRIVATE /Z7 /O2 /Wall)
+    target_compile_options(${TARGET_LIBBZ2} PRIVATE /O2 /Wall)
 else()
-    target_compile_options(${TARGET_LIBBZ2} PRIVATE -Wall -Winline -O2 -g)
+    target_compile_options(${TARGET_LIBBZ2} PRIVATE -Wall -Winline -O2)
 endif()
 
 # don't install into the system but into the MX project's output dir

graalpython/python-liblzma/CMakeLists.txt

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2023, Oracle and/or its affiliates.
+# Copyright (c) 2023, 2024, Oracle and/or its affiliates.
 #
 # All rights reserved.
 #
@@ -82,10 +82,10 @@ if(WIN32)
     target_compile_options(${TARGET_LZMA} PRIVATE /Z7 /O2)
     target_compile_options(${TARGET_LZMASUPPORT} PRIVATE /Z7 /O2 /W3 /WX)
 else()
-    target_compile_options(${TARGET_LZMA} PRIVATE -fPIC -DPIC -g -O2)
+    target_compile_options(${TARGET_LZMA} PRIVATE -fPIC -DPIC -O2)
     target_compile_definitions(${TARGET_LZMA} PRIVATE PIC)
 
-    target_compile_options(${TARGET_LZMASUPPORT} PRIVATE -g -O3 -Wall -Werror)
+    target_compile_options(${TARGET_LZMASUPPORT} PRIVATE -O3 -Wall -Werror)
 endif()
 
 # don't install into the system but into the MX project's output dir

mx.graalpython/suite.py

@@ -821,8 +821,8 @@
                     "<others>": {
                         "cflags": [
                             "-DHPY_ABI_HYBRID", "-DHPY_EMBEDDED_MODULES", "-DNDEBUG", "-DMS_WINDOWS",
-                            # cflags equivalent to -g -O3 -Wall (/W3, could be /Wall) -Werror (/WX)
-                            "-D_CRT_SECURE_NO_WARNINGS", "/Z7", "/O2", "/W3", "/WX",
+                            # cflags equivalent to -O3 -Wall (/W3, could be /Wall) -Werror (/WX)
+                            "-D_CRT_SECURE_NO_WARNINGS", "/O2", "/W3", "/WX",
                             "-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\"",
@@ -857,13 +857,13 @@
             "deliverable": "zsupport",
             "buildDependencies": [],
             "cflags": [
-                "-DNDEBUG", "-g", "-O3", "-Werror",
+                "-DNDEBUG", "-O3", "-Werror",
             ],
             "ldlibs": ["-lz"],
             "os_arch": {
                 "windows": {
                     "<others>": {
-                        # "/Z7", "/O2", "/WX", # cflags to replace -g -O3 -Werror
+                        # "/O2", "/WX", # cflags to replace -O3 -Werror
                         "defaultBuild": False,
                     },
                 },
@@ -881,12 +881,12 @@
             "deliverable": "posix",
             "buildDependencies": [],
             "cflags": [
-                "-DNDEBUG", "-g", "-O3", "-Wall", "-Werror",
+                "-DNDEBUG", "-O3", "-Wall", "-Werror",
             ],
             "os_arch": {
                 "windows": {
                     "<others>": {
-                        # "/Z7", "/O2", "/WX", # cflags to replace -g -O3 -Werror
+                        # "/O2", "/WX", # cflags to replace -O3 -Werror
                         "defaultBuild": False,
                     },
                 },