sergiodj/gdb-buildbot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix Solaris config

Browse source
This commit is contained in:
Sergio Durigan Junior 2018-09-24 11:02:42 -04:00
parent 1dce53f343
commit ac89f66756
1 changed files with 6 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
master.cfg
View file

@ -1006,9 +1006,6 @@ The parameters of the class are:
use_system_debuginfo = True use_system_debuginfo = True
system_debuginfo_location = "/usr/lib/debug" system_debuginfo_location = "/usr/lib/debug"
# Disable the use of default_{CFLAGS,CXXFLAGS} when compiling GDB.
disable_default_compilation_flags = False
def __init__ (self, architecture_triplet = [], initial_delay = None): def __init__ (self, architecture_triplet = [], initial_delay = None):
factory.BuildFactory.__init__ (self) factory.BuildFactory.__init__ (self)
@ -1052,13 +1049,8 @@ The parameters of the class are:
if self.use_system_debuginfo: if self.use_system_debuginfo:
self.extra_conf_flags.append ('--with-separate-debug-dir=%s' % self.system_debuginfo_location) self.extra_conf_flags.append ('--with-separate-debug-dir=%s' % self.system_debuginfo_location)
myCFLAGS = "CFLAGS=" myCFLAGS = "CFLAGS=" + default_CFLAGS + ' '.join (self.extra_CFLAGS)
myCXXFLAGS = "CXXFLAGS=" myCXXFLAGS = "CXXFLAGS=" + default_CXXFLAGS + ' '.join (self.extra_CXXFLAGS)
if not self.disable_default_compilation_flags:
myCFLAGS += default_CFLAGS + " "
myCXXFLAGS += default_CXXFLAGS + " "
myCFLAGS += ' '.join (self.extra_CFLAGS)
myCXXFLAGS += ' '.join (self.extra_CXXFLAGS)
self.extra_conf_flags.append (myCFLAGS) self.extra_conf_flags.append (myCFLAGS)
self.extra_conf_flags.append (myCXXFLAGS) self.extra_conf_flags.append (myCXXFLAGS)
@ -1293,23 +1285,15 @@ class RunTestGDBSolaris_Common (BuildAndTestGDBFactory):
# build/23676. This can be avoided either by performing a -g # build/23676. This can be avoided either by performing a -g
# -O build or with --disable-unit-tests from Sergio's proposed # -O build or with --disable-unit-tests from Sergio's proposed
# patch. # patch.
self.disable_default_compilation_flags = True self.extra_CFLAGS = [ '-O' ]
self.extra_CXXFLAGS = [ '-O' ]
BuildAndTestGDBFactory.__init__ (self, **kwargs) BuildAndTestGDBFactory.__init__ (self, **kwargs)
class RunTestGDBPlainSolaris_c64 (RunTestGDBSolaris_Common): class RunTestGDBPlainSolaris_c64 (RunTestGDBSolaris_Common):
"""Compiling for Solaris""" """Compiling for Solaris"""
def __init__ (self, **kwargs): def __init__ (self, **kwargs):
self.extra_CFLAGS = [ '-m64' ] self.extra_CFLAGS.append ('-m64')
self.extra_CXXFLAGS = self.extra_CFLAGS self.extra_CXXFLAGS.append ('-m64')
self.enable_targets_all = False
self.make_command = 'gmake'
self.run_testsuite = False
# While a regular gdb build succeeds, a -g -D_GLIBCXX_DEBUG
# build as used by the buildbot fails as reported in PR
# build/23676. This can be avoided either by performing a -g
# -O build or with --disable-unit-tests from Sergio's proposed
# patch.
self.disable_default_compilation_flags = True
BuildAndTestGDBFactory.__init__ (self, **kwargs) BuildAndTestGDBFactory.__init__ (self, **kwargs)
# All branches that are going to be watched. # All branches that are going to be watched.