From ffac3f95d3869a94dd08ccb0b1074be05b4b2815 Mon Sep 17 00:00:00 2001 From: Ryan Kurtz Date: Tue, 14 Apr 2026 04:56:40 -0400 Subject: [PATCH 1/2] GP-0: GnuDisassembler now compilers on newer gcc's (Closes #9067) --- GPL/GnuDisassembler/buildGdis.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GPL/GnuDisassembler/buildGdis.gradle b/GPL/GnuDisassembler/buildGdis.gradle index a3e601ee81..3f3a85de26 100644 --- a/GPL/GnuDisassembler/buildGdis.gradle +++ b/GPL/GnuDisassembler/buildGdis.gradle @@ -37,7 +37,7 @@ model { all { def binutilsArtifactsDir = file("build/binutils/${targetPlatform.name}") if ((toolChain in Gcc) || (toolChain in Clang)) { - cCompiler.args "-I${binutilsArtifactsDir}/include", "-I${binutilsArtifactsDir}/bfd", "-I${binutilsArtifactsDir}/libsframe" + cCompiler.args "-I${binutilsArtifactsDir}/include", "-I${binutilsArtifactsDir}/bfd", "-I${binutilsArtifactsDir}/libsframe", "-std=gnu17" linker.args "-L${binutilsArtifactsDir}/lib", "-lopcodes", "-lbfd", "-lsframe", "-liberty", "-lz", "-ldl" } } From 79da29c6f60e8fdeb10256c3bd15024fab96f8fa Mon Sep 17 00:00:00 2001 From: Ryan Kurtz Date: Tue, 14 Apr 2026 06:23:14 -0400 Subject: [PATCH 2/2] GP-6704: Fixed expanding env vars in launch.properties when they contained regex chars (Closes #9061) --- GhidraBuild/LaunchSupport/src/main/java/LaunchSupport.java | 2 +- .../src/main/java/ghidra/launch/LaunchProperties.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/GhidraBuild/LaunchSupport/src/main/java/LaunchSupport.java b/GhidraBuild/LaunchSupport/src/main/java/LaunchSupport.java index bca5dea6e6..78fd127ba0 100644 --- a/GhidraBuild/LaunchSupport/src/main/java/LaunchSupport.java +++ b/GhidraBuild/LaunchSupport/src/main/java/LaunchSupport.java @@ -124,7 +124,7 @@ public class LaunchSupport { } } catch (Exception e) { - System.err.println(e.getMessage()); + e.printStackTrace(System.err); } System.exit(exitCode); diff --git a/GhidraBuild/LaunchSupport/src/main/java/ghidra/launch/LaunchProperties.java b/GhidraBuild/LaunchSupport/src/main/java/ghidra/launch/LaunchProperties.java index f0b25fd987..a1462a92a1 100644 --- a/GhidraBuild/LaunchSupport/src/main/java/ghidra/launch/LaunchProperties.java +++ b/GhidraBuild/LaunchSupport/src/main/java/ghidra/launch/LaunchProperties.java @@ -220,7 +220,7 @@ public class LaunchProperties { String key = entry.getKey(); String value = entry.getValue(); try { - text = text.replaceAll("\\$\\{" + key + "\\}", value.replace("\\", "\\\\")); + text = text.replace("${" + key + "}", value); } catch (IllegalArgumentException e) { String msg =