Gabe Black has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/56895 )
(
4 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the
submitted one.
)Change subject: scons: Handle TARGET_GPU_ISA not being set.
......................................................................
scons: Handle TARGET_GPU_ISA not being set.
If TARGET_GPU_ISA is not set, even if the GPU ISA namespace isn't used
by anything, the logic which figures out what to set it to will fail.
This checks for that condition and sets it to something invalid, but
doesn't crash. If that namespace is actually used, then the build will
still fail.
Change-Id: Iec44255cccbafa4aceaa68bdd8b6a835dc0637a0
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/56895
Reviewed-by: Matthew Poremba <[email protected]>
Maintainer: Gabe Black <[email protected]>
Tested-by: kokoro <[email protected]>
---
M src/SConscript
1 file changed, 23 insertions(+), 1 deletion(-)
Approvals:
Matthew Poremba: Looks good to me, approved
Gabe Black: Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/SConscript b/src/SConscript
index 6c8ccaf..d3c5a5c 100644
--- a/src/SConscript
+++ b/src/SConscript
@@ -563,7 +563,10 @@
def makeTheGPUISA(source, target, env):
gpu_isa = env['TARGET_GPU_ISA']
- namespace = gpu_isa[0].upper() + gpu_isa[1:].lower() + 'ISA'
+ if gpu_isa:
+ namespace = gpu_isa[0].upper() + gpu_isa[1:].lower() + 'ISA'
+ else:
+ namespace = 'None'
code = code_formatter()
code('''\
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/56895
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: Iec44255cccbafa4aceaa68bdd8b6a835dc0637a0
Gerrit-Change-Number: 56895
Gerrit-PatchSet: 6
Gerrit-Owner: Gabe Black <[email protected]>
Gerrit-Reviewer: Gabe Black <[email protected]>
Gerrit-Reviewer: Matthew Poremba <[email protected]>
Gerrit-Reviewer: kokoro <[email protected]>
Gerrit-MessageType: merged
_______________________________________________
gem5-dev mailing list -- [email protected]
To unsubscribe send an email to [email protected]
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
