Nixyri/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2024-11-24 21:21:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

GP-1106: Fixing issue with gradle string comparisons

Browse Source
This commit is contained in:
Ryan Kurtz 2021-09-01 07:37:58 -04:00
parent 86e579d910
commit 96683a8dce
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
GPL/nativePlatforms.gradle
View File

@ -31,7 +31,7 @@ project.ext.PLATFORMS = [
* Returns the local platform name. * Returns the local platform name.
*********************************************************************************/ *********************************************************************************/
import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform
ext.currentPlatformName = null ext.currentPlatformName = findProperty("currentPlatformName")
ext.getCurrentPlatformName = { ext.getCurrentPlatformName = {
if (currentPlatformName) { if (currentPlatformName) {
@ -75,7 +75,7 @@ ext.getCurrentPlatformName = {
throw new GradleException("Unrecognized platform architecture: $arch" ) throw new GradleException("Unrecognized platform architecture: $arch" )
} }
currentPlatformName = "${os}_${arch}" currentPlatformName = "${os}_${arch}".toString() // convert GStringImpl to String so .equals() works as expected
println "OS: " + osJvm + (osJvm != osGradle ? " (gradle: " + osGradle + ")" : "") println "OS: " + osJvm + (osJvm != osGradle ? " (gradle: " + osGradle + ")" : "")
println "Arch: " + archJvm + (archJvm != archGradle ? " (gradle: " + archGradle + ")" : "") println "Arch: " + archJvm + (archJvm != archGradle ? " (gradle: " + archGradle + ")" : "")