File tree Expand file tree Collapse file tree 2 files changed +5
-7
lines changed Expand file tree Collapse file tree 2 files changed +5
-7
lines changed Original file line number Diff line number Diff line change @@ -145,9 +145,6 @@ jobs:
145145 env :
146146 LINKERD2_PROXY_VENDOR : ${{ github.repository_owner }}
147147 LINKERD2_PROXY_VERSION : ${{ needs.meta.outputs.version }}
148- # TODO: these variables will be included in dev v48
149- AWS_LC_SYS_CFLAGS_aarch64_unknown_linux_gnu : " -fuse-ld=/usr/aarch64-linux-gnu/bin/ld"
150- AWS_LC_SYS_CFLAGS_aarch64_unknown_linux_musl : " -fuse-ld=/usr/aarch64-linux-gnu/bin/ld"
151148 steps :
152149 # TODO: add to dev image
153150 - name : Install MiniGW
@@ -157,10 +154,7 @@ jobs:
157154 - name : Install cross compilation toolchain
158155 if : matrix.arch == 'arm64'
159156 run : apt-get update && apt-get install --no-install-recommends -y \
160- g++-aarch64-linux-gnu \
161- gcc-aarch64-linux-gnu \
162- binutils-aarch64-linux-gnu \
163- libc6-dev-arm64-cross
157+ binutils-aarch64-linux-gnu
164158 - name : Configure git
165159 run : git config --global --add safe.directory "$PWD" # actions/runner#2033
166160 - uses : actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
Original file line number Diff line number Diff line change @@ -18,6 +18,10 @@ features := ""
1818export LINKERD2_PROXY_VERSION := env_var_or_default (" LINKERD2_PROXY_VERSION" , " 0.0.0-dev" + ` git rev-parse --short HEAD ` )
1919export LINKERD2_PROXY_VENDOR := env_var_or_default (" LINKERD2_PROXY_VENDOR" , ` whoami ` + " @" + ` hostname ` )
2020
21+ # TODO: these variables will be included in dev v48
22+ export AWS_LC_SYS_CFLAGS_aarch64_unknown_linux_gnu := env_var_or_default (" AWS_LC_SYS_CFLAGS_aarch64_unknown_linux_gnu" , " -fuse-ld=/usr/aarch64-linux-gnu/bin/ld" )
23+ export AWS_LC_SYS_CFLAGS_aarch64_unknown_linux_musl := env_var_or_default (" AWS_LC_SYS_CFLAGS_aarch64_unknown_linux_musl" , " -fuse-ld=/usr/aarch64-linux-gnu/bin/ld" )
24+
2125# The version name to use for packages.
2226package_version := " v" + LINKERD2_PROXY_VERSION
2327
You can’t perform that action at this time.
0 commit comments