|
|
@ -1338,7 +1338,7 @@ class Interpreter(InterpreterBase): |
|
|
|
projname, depname = di |
|
|
|
projname, depname = di |
|
|
|
subproj = self.do_subproject(projname, {}) |
|
|
|
subproj = self.do_subproject(projname, {}) |
|
|
|
self.build.cross_stdlibs[l] = subproj.get_variable_method([depname], {}) |
|
|
|
self.build.cross_stdlibs[l] = subproj.get_variable_method([depname], {}) |
|
|
|
except KeyError as e: |
|
|
|
except KeyError: |
|
|
|
pass |
|
|
|
pass |
|
|
|
|
|
|
|
|
|
|
|
@stringArgs |
|
|
|
@stringArgs |
|
|
@ -1565,16 +1565,13 @@ class Interpreter(InterpreterBase): |
|
|
|
for defopt in self.default_project_options: |
|
|
|
for defopt in self.default_project_options: |
|
|
|
key, value = defopt.split('=') |
|
|
|
key, value = defopt.split('=') |
|
|
|
pref = key + '=' |
|
|
|
pref = key + '=' |
|
|
|
was_found = False |
|
|
|
|
|
|
|
for i in default_options: |
|
|
|
for i in default_options: |
|
|
|
if i.startswith(pref): |
|
|
|
if i.startswith(pref): |
|
|
|
was_found = True |
|
|
|
|
|
|
|
break |
|
|
|
break |
|
|
|
if was_found: |
|
|
|
else: |
|
|
|
break |
|
|
|
defopt = self.subproject + ':' + defopt |
|
|
|
defopt = self.subproject + ':' + defopt |
|
|
|
newoptions = [defopt] + self.environment.cmd_line_options.projectoptions |
|
|
|
newoptions = [defopt] + self.environment.cmd_line_options.projectoptions |
|
|
|
self.environment.cmd_line_options.projectoptions = newoptions |
|
|
|
self.environment.cmd_line_options.projectoptions = newoptions |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@stringArgs |
|
|
|
@stringArgs |
|
|
|
def func_project(self, node, args, kwargs): |
|
|
|
def func_project(self, node, args, kwargs): |
|
|
|