From aa49ebd47f708b13a10efa898b913d46c5df949d Mon Sep 17 00:00:00 2001 From: Thad House Date: Tue, 25 Oct 2016 20:42:42 -0700 Subject: [PATCH] Links wpiutil on roboRIO dynamically (#141) --- ntcore.gradle | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ntcore.gradle b/ntcore.gradle index 623e085c5c..7449054d91 100644 --- a/ntcore.gradle +++ b/ntcore.gradle @@ -39,8 +39,11 @@ def ntcoreSetupModel = { project -> } includes = ['**/*.h'] } - if (project.isArm) { + if (project.isArm && project.hasProperty('compilerPrefix')) { lib project: ':arm:wpiutil', library: 'wpiutil', linkage: 'static' + } else if (project.isArm) { + // If roboRIO, link shared + lib project: ':arm:wpiutil', library: 'wpiutil', linkage: 'shared' } else { lib project: ':native:wpiutil', library: 'wpiutil', linkage: 'static' }