From 5df78c520c444a106cbdee187f4a8a538426939d Mon Sep 17 00:00:00 2001
From: Thad House <ThadHouse@users.noreply.github.com>
Date: Tue, 3 Jan 2017 19:12:47 -0800
Subject: [PATCH] Adds support for building separate armhf artifacts (#177)

Currently if using a separate compiler prefix, it would still get published
to the arm classifier. This modifies so a classifier suffix can be used to
disambiguate arm from armhf.
---
 ntcore.gradle  | 7 ++++++-
 wpiutil.gradle | 7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/ntcore.gradle b/ntcore.gradle
index 59ed966aac..39fb71e0d3 100644
--- a/ntcore.gradle
+++ b/ntcore.gradle
@@ -61,7 +61,12 @@ def ntcoreZipTask = { project ->
         group = 'WPILib'
         destinationDir = project.buildDir
         baseName = 'ntcore'
-        classifier = "${project.buildPlatform}"
+        if (project.isArm && project.hasProperty('compilerPrefix')
+            && project.hasProperty('armSuffix')) {
+            classifier = "${project.buildPlatform}${project.armSuffix}"
+        } else {
+            classifier = "${project.buildPlatform}"
+        }
         duplicatesStrategy = 'exclude'
 
         from(file('include')) {
diff --git a/wpiutil.gradle b/wpiutil.gradle
index a2b2204441..6cd9fabc09 100644
--- a/wpiutil.gradle
+++ b/wpiutil.gradle
@@ -34,7 +34,12 @@ def wpiutilZipTask = { project ->
         group = 'WPILib'
         destinationDir = project.buildDir
         baseName = 'wpiutil'
-        classifier = "${project.buildPlatform}"
+        if (project.isArm && project.hasProperty('compilerPrefix')
+            && project.hasProperty('armSuffix')) {
+            classifier = "${project.buildPlatform}${project.armSuffix}"
+        } else {
+            classifier = "${project.buildPlatform}"
+        }
         duplicatesStrategy = 'exclude'
 
         from(file('wpiutil/include')) {