diff options
| -rwxr-xr-x | SConstruct | 6 | ||||
| -rwxr-xr-x | src/SConscript | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/SConstruct b/SConstruct index d252865db..f56c23df7 100755 --- a/SConstruct +++ b/SConstruct @@ -1357,7 +1357,6 @@ def make_switching_dir(dname, switch_headers, env): env.Command(hdr, [], switch_hdr_action) isa_target = Dir('.').up().name.lower().replace('_', '-') - env['PHONY_BASE'] = '#'+isa_target all_isa_deps[isa_target] = None Export('make_switching_dir') @@ -1421,6 +1420,11 @@ BUILD_TARGETS[:] = ['#all-targets'] # ################################################### +def variant_name(path): + return os.path.basename(path).lower().replace('_', '-') +main['variant_name'] = variant_name +main['VARIANT_NAME'] = '${variant_name(BUILDDIR)}' + for variant_path in variant_paths: if not GetOption('silent'): print "Building in", variant_path diff --git a/src/SConscript b/src/SConscript index 155dcf53d..ed59bd228 100755 --- a/src/SConscript +++ b/src/SConscript @@ -1233,9 +1233,9 @@ env.Append(BUILDERS = {'MakeEnvirons' : Builder(action=MakeAction(makeEnvirons, Transform("ENVIRONS", 1)))}) -isa_target = env['PHONY_BASE'] + '-deps' -environs = env['PHONY_BASE'] + '-environs' -env.Depends('#all-deps', isa_target) +isa_target = '#${VARIANT_NAME}-deps' +environs = '#${VARIANT_NAME}-environs' +env.Depends('#all-deps', isa_target) env.Depends('#all-environs', environs) env.ScanISA(isa_target, File('arch/%s/generated/inc.d' % env['TARGET_ISA'])) envSetup = env.MakeEnvirons(environs, isa_target) |