-
Notifications
You must be signed in to change notification settings - Fork 2.6k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Separate the Arm Compiler 5 and 6 components #9075
base: development
Are you sure you want to change the base?
Conversation
This allows us to test for the presence of each compiler separately. Signed-off-by: Bence Szépkúti <bence.szepkuti@arm.com>
@@ -77,15 +77,13 @@ echo | |||
print_version "cmake" "--version" "" "head -n 1" | |||
echo | |||
|
|||
if [ "${RUN_ARMCC:-1}" -ne 0 ]; then |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please keep the check on RUN_ARMCC
. The goal of this check is to avoid timing out and erroring out if you run all.sh
without access to a license.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I've tested this patch by unsetting ARMLMD_LICENSE_FILE
, and output_env.sh
completed without an error code.
When does this cause a hang exactly? When there is a Technet license server defined, but a license is not available?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
My typical scenario is: I'm working from home or on the move, and not on the VPN. I have ARMLMD_LICENSE_FILE
set all the time because I do want Arm compilers to work when they can. Invoking armcc --version
or the like makes it hang.
Also, even if it doesn't hang, it's slow. In particular, all.sh --list-components
should not invoke an Arm compiler, otherwise it makes completion painfully slow.
This commit replaces the previous RUN_ARMCC enviornment variable used by output_env.sh with RUN_ARMC5 and RUN_ARMC6. Signed-off-by: Bence Szépkúti <bence.szepkuti@arm.com>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM with just one suggestion for improvement.
armc5_cc="$ARMC5_BIN_DIR/armcc" | ||
(check_tools "$armc5_cc" > /dev/null 2>&1) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Preexisting: check_tools
can use return 1
instead of exit 1
(I seem to have missed that years ago when structuring the files into functions), and so it wouldn't need to be put in a subshell here.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
I'm afraid there's a merge conflict now. And we still need the backports. |
Description
This allows us to test for the presence of each compiler separately. This change is needed to drop the testing of Arm compiler 5 on the OpenCI.
PR checklist
Please tick as appropriate and edit the reasons (e.g.: "backport: not needed because this is a new feature")