Merge branch 'master' of git.cs.lth.se:noricc/jbrainy

build.gradle

@@ -38,9 +38,9 @@ class PAPIPlugin implements Plugin<Project> {
     }
 
     def findPapi() {
-        def options = [Paths.get("/usr", "lib", "x86_64-linux-gnu", "libpapi.so"),
-                       Paths.get("/usr", "local", "lib", "x86_64-linux-gnu", "libpapi.so"),
-                       Paths.get("/usr", "local", "lib", "libpapi.so")]
+        def options = [Paths.get("/usr", "local", "lib", "libpapi.so"),
+		       Paths.get("/usr", "lib", "x86_64-linux-gnu", "libpapi.so"),
+                       Paths.get("/usr", "local", "lib", "x86_64-linux-gnu", "libpapi.so")]
 
         def env = System.getenv()
         if (env.containsKey("PAPI_LIBRARY_PATH")) {