mirror of
https://git.rtems.org/rtems-source-builder
synced 2024-10-09 07:15:10 +08:00
Detect a Cxc build from the options and automatically disabled installing.
This is similar to always providing --no-install on the command when building a Cxc package.
This commit is contained in:
parent
0392c5fe6c
commit
3963ac4aae
@ -297,6 +297,10 @@ class command_line:
|
|||||||
rsb_macros = path.join(os.environ['HOME'], '.rsb_macros')
|
rsb_macros = path.join(os.environ['HOME'], '.rsb_macros')
|
||||||
if path.exists(rsb_macros):
|
if path.exists(rsb_macros):
|
||||||
self.defaults.load(rsb_macros)
|
self.defaults.load(rsb_macros)
|
||||||
|
# If a Cxc build disable installing.
|
||||||
|
if self.canadian_cross():
|
||||||
|
self.opts['no-install'] = '1'
|
||||||
|
self.defaults['_no_install'] = '1'
|
||||||
|
|
||||||
def sb_git(self):
|
def sb_git(self):
|
||||||
repo = git.repo(self.defaults.expand('%{_sbdir}'), self)
|
repo = git.repo(self.defaults.expand('%{_sbdir}'), self)
|
||||||
@ -360,6 +364,15 @@ class command_line:
|
|||||||
def no_install(self):
|
def no_install(self):
|
||||||
return self.opts['no-install'] != '0'
|
return self.opts['no-install'] != '0'
|
||||||
|
|
||||||
|
def canadian_cross(self):
|
||||||
|
_host = self.defaults.expand('%{_host}')
|
||||||
|
_build = self.defaults.expand('%{_build}')
|
||||||
|
_target = self.defaults.expand('%{_target}')
|
||||||
|
if len(_target):
|
||||||
|
return len(_host) and len(_build) and (_target) and \
|
||||||
|
_host != _build and _host != _target
|
||||||
|
return len(_host) and len(_build) and _host != _build
|
||||||
|
|
||||||
def user_macros(self):
|
def user_macros(self):
|
||||||
#
|
#
|
||||||
# Return something even if it does not exist.
|
# Return something even if it does not exist.
|
||||||
|
@ -458,8 +458,10 @@ def run():
|
|||||||
deps = None
|
deps = None
|
||||||
if not list_bset_cfg_files(opts, configs):
|
if not list_bset_cfg_files(opts, configs):
|
||||||
prefix = opts.defaults.expand('%{_prefix}')
|
prefix = opts.defaults.expand('%{_prefix}')
|
||||||
if not opts.dry_run() and not opts.no_install() and \
|
if not opts.dry_run() and \
|
||||||
not path.ispathwritable(prefix):
|
not not opts.canadian_cross() and \
|
||||||
|
not opts.no_install() and \
|
||||||
|
not path.ispathwritable(prefix):
|
||||||
raise error.general('prefix is not writable: %s' % (path.host(prefix)))
|
raise error.general('prefix is not writable: %s' % (path.host(prefix)))
|
||||||
for bset in opts.params():
|
for bset in opts.params():
|
||||||
setbuilder_error = True
|
setbuilder_error = True
|
||||||
|
Loading…
x
Reference in New Issue
Block a user