Strip debug symbols regardless quarkusio#9792

galderz · Jun 18, 2020 · ca327b1 · ca327b1
1 parent e2ffd66
commit ca327b1
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/NativeImageBuildStep.java b/core/deployment/src/main/java/io/quarkus/deployment/pkg/steps/NativeImageBuildStep.java
@@ -362,8 +362,12 @@ public NativeImageBuildItem build(NativeConfig nativeConfig, NativeImageSourceJa
             Files.delete(generatedImage);
             System.setProperty("native.image.path", finalPath.toAbsolutePath().toString());
 
-            if (nativeConfig.debug.enabled && objcopyExists(env)) {
-                splitDebugSymbols(finalPath);
+            if (objcopyExists(env)) {
+                if (nativeConfig.debug.enabled) {
+                    splitDebugSymbols(finalPath);
+                }
+                // Strip debug symbols regardless, because the the underlying JDK might contain them
+                objcopy("--strip-debug", finalPath.toString());
             }
 
             return new NativeImageBuildItem(finalPath);
@@ -558,7 +562,6 @@ private boolean objcopyExists(Map<String, String> env) {
     private void splitDebugSymbols(Path executable) {
         Path symbols = Paths.get(String.format("%s.debug", executable.toString()));
         objcopy("--only-keep-debug", executable.toString(), symbols.toString());
-        objcopy("--strip-debug", executable.toString());
         objcopy(String.format("--add-gnu-debuglink=%s", symbols.toString()), executable.toString());
     }