mirror/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-07-30 07:18:37 -09:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/Ghidra_12.1'

Browse Source
This commit is contained in:
Ryan Kurtz
2026-04-14 06:26:56 -04:00
parent b82a2b4fc2 79da29c6f6
commit 0012731c10
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
GPL/GnuDisassembler/buildGdis.gradle
View File

@@ -37,7 +37,7 @@ model {
all { all {
def binutilsArtifactsDir = file("build/binutils/${targetPlatform.name}") def binutilsArtifactsDir = file("build/binutils/${targetPlatform.name}")
if ((toolChain in Gcc) || (toolChain in Clang)) { 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" linker.args "-L${binutilsArtifactsDir}/lib", "-lopcodes", "-lbfd", "-lsframe", "-liberty", "-lz", "-ldl"
} }
} }

2
GhidraBuild/LaunchSupport/src/main/java/LaunchSupport.java
View File

@@ -124,7 +124,7 @@ public class LaunchSupport {
} }
} }
catch (Exception e) { catch (Exception e) {
System.err.println(e.getMessage()); e.printStackTrace(System.err);
} }
System.exit(exitCode); System.exit(exitCode);

2
GhidraBuild/LaunchSupport/src/main/java/ghidra/launch/LaunchProperties.java
View File

@@ -220,7 +220,7 @@ public class LaunchProperties {
String key = entry.getKey(); String key = entry.getKey();
String value = entry.getValue(); String value = entry.getValue();
try { try {
text = text.replaceAll("\\$\\{" + key + "\\}", value.replace("\\", "\\\\")); text = text.replace("${" + key + "}", value);
} }
catch (IllegalArgumentException e) { catch (IllegalArgumentException e) {
String msg = String msg =