From 002434629db61c936c8153a9f8e61290bc43a89f Mon Sep 17 00:00:00 2001 From: Sergio Durigan Junior Date: Thu, 20 Sep 2018 10:16:44 -0400 Subject: [PATCH] Fix Solaris slaves --- lib/config.json | 2 -- master.cfg | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/config.json b/lib/config.json index bd8fede..530ad24 100644 --- a/lib/config.json +++ b/lib/config.json @@ -338,14 +338,12 @@ "slavenames" : [ "ubuntu-trusty-aarch32-1" ] }, { "name" : "Solaris11-amd64-m64", - "arch_triplet" : "amd64-pc-solaris2.11", "type" : "PlainSolaris_c64", "builddir" : "solaris11-amd64-m64", "tags" : [ "solaris", "solaris11", "x86_64", "m64", "MAIL" ], "slavenames" : [ "solaris11-amd64" ] }, { "name" : "Solaris11-sparcv9-m64", - "arch_triplet" : "sparcv9-sun-solaris2.11", "type" : "PlainSolaris_c64", "builddir" : "solaris11-sparcv9-m64", "tags" : [ "solaris", "solaris11", "sparcv9", "m64", "MAIL" ], diff --git a/master.cfg b/master.cfg index 3b38f27..522ac6f 100644 --- a/master.cfg +++ b/master.cfg @@ -1301,6 +1301,7 @@ class RunTestGDBPlainSolaris_c64 (RunTestGDBSolaris_Common): def __init__ (self, **kwargs): self.extra_CFLAGS = [ '-m64' ] self.extra_CXXFLAGS = self.extra_CFLAGS + BuildAndTestGDBFactory.__init__ (self, **kwargs) # Classes needed for ARM (running on Aarch64, on Yao's buildslave)