Skip to content

Commit 8ec312c

Browse files
mralephCommit Queue
authored andcommitted
Revert "[pkg/vm] Handle cross compilation in dart_precompiled_ru..."
Revert changes to precompiler2 and dart_precompiled_runtime. Reason for revert: Golem is broken because host_arch helper does not handle aarch64 as a possibility (which is what we get from uname on these machines). Reverted changes: /q/submissionid:404600 Change-Id: I4a78ed1e4853de1c12b3341da15c0f068bf2839a Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/405640 Bot-Commit: Rubber Stamper <[email protected]> Reviewed-by: Alexander Markov <[email protected]> Commit-Queue: Slava Egorov <[email protected]>
1 parent 11ea496 commit 8ec312c

File tree

1 file changed

+1
-30
lines changed

1 file changed

+1
-30
lines changed

pkg/vm/tool/dart_precompiled_runtime2

Lines changed: 1 addition & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -23,43 +23,14 @@ PROG_NAME="$(follow_links "$BASH_SOURCE")"
2323
# Handle the case where dart-sdk/bin has been symlinked to.
2424
CUR_DIR="$(cd "${PROG_NAME%/*}" ; pwd -P)"
2525

26-
. "$CUR_DIR/shared_functions.sh"
27-
2826
if [[ `uname` == 'Darwin' ]];
2927
then
3028
OUT_DIR="$CUR_DIR"/../../../xcodebuild/
3129
else
3230
OUT_DIR="$CUR_DIR"/../../../out/
3331
fi
3432

35-
HOST_ARCH="$(host_arch)"
36-
3733
export DART_CONFIGURATION=${DART_CONFIGURATION:-ReleaseX64}
38-
TARGET_ARCH="$(parse_target_arch "$DART_CONFIGURATION")"
3934
BIN_DIR="$OUT_DIR$DART_CONFIGURATION"
40-
if [ ! -d "$BIN_DIR" ]; then
41-
echo "$BIN_DIR is not a directory"
42-
exit 1
43-
fi
44-
45-
QEMU=""
46-
# If the target architecture differs from the host architecture, use qemu
47-
# to run the cross-compiled binary. Cross compilation is denoted by an X
48-
# between the build mode and the architecture name, re.g., ReleaseXARM64 on X64.
49-
if [[ ( "$DART_CONFIGURATION" =~ (Debug|Release|Product)X[^6] ) && \
50-
( "$HOST_ARCH" != "$TARGET_ARCH" ) ]]; then
51-
case "$TARGET_ARCH" in
52-
"ARM64")
53-
QEMU="qemu-aarch64 -L /usr/aarch64-linux-gnu/"
54-
;;
55-
"ARM")
56-
QEMU="qemu-arm -L /usr/arm-linux-gnueabihf/"
57-
;;
58-
*)
59-
echo "No qemu handling for running $TARGET_ARCH binaries on $HOST_ARCH"
60-
exit 1
61-
;;
62-
esac
63-
fi
6435

65-
exec $QEMU "$BIN_DIR"/dartaotruntime "$@"
36+
exec "$BIN_DIR"/dartaotruntime "$@"

0 commit comments

Comments
 (0)