diff options
| -rwxr-xr-x | SConstruct | 31 | ||||
| -rw-r--r-- | src/arch/SConscript | 8 |
2 files changed, 4 insertions, 35 deletions
diff --git a/SConstruct b/SConstruct index 1efd1068d..30f99c7b2 100755 --- a/SConstruct +++ b/SConstruct @@ -1331,8 +1331,6 @@ main.Prepend(CPPPATH=Dir('ext/pybind11/include/')) # ################################################### -main['ALL_GPU_ISA_LIST'] = all_gpu_isa_list - def build_switching_header(target, source, env): path = str(target[0]) subdir = str(source[0]) @@ -1357,35 +1355,6 @@ def switching_headers(self, headers, source): main.AddMethod(switching_headers, 'SwitchingHeaders') -def make_gpu_switching_dir(dname, switch_headers, env): - # Generate the header. target[0] is the full path of the output - # header to generate. 'source' is a dummy variable, since we get the - # list of ISAs from env['ALL_ISA_LIST']. - def gen_switch_hdr(target, source, env): - fname = str(target[0]) - - isa = env['TARGET_GPU_ISA'].lower() - - try: - f = open(fname, 'w') - print >>f, '#include "%s/%s/%s"' % (dname, isa, basename(fname)) - f.close() - except IOError: - print "Failed to create %s" % fname - raise - - # Build SCons Action object. 'varlist' specifies env vars that this - # action depends on; when env['ALL_ISA_LIST'] changes these actions - # should get re-executed. - switch_hdr_action = MakeAction(gen_switch_hdr, - Transform("GENERATE"), varlist=['ALL_ISA_GPU_LIST']) - - # Instantiate actions for each header - for hdr in switch_headers: - env.Command(hdr, [], switch_hdr_action) - -Export('make_gpu_switching_dir') - # all-isas -> all-deps -> all-environs -> all_targets main.Alias('#all-isas', []) main.Alias('#all-deps', '#all-isas') diff --git a/src/arch/SConscript b/src/arch/SConscript index 891a5a29a..ea940560d 100644 --- a/src/arch/SConscript +++ b/src/arch/SConscript @@ -67,13 +67,13 @@ env.SwitchingHeaders( env.subst('${TARGET_ISA}')) if env['BUILD_GPU']: - gpu_isa_switch_hdrs = Split(''' + env.SwitchingHeaders( + Split(''' gpu_decoder.hh gpu_isa.hh gpu_types.hh - ''') - - make_gpu_switching_dir('arch', gpu_isa_switch_hdrs, env) + '''), + env.subst('${TARGET_GPU_ISA}')) ################################################################# # |