Skip to content

Commit 95115bb

Browse files
committed
---
yaml --- r: 233562 b: refs/heads/beta c: 983d2b3 h: refs/heads/master v: v3
1 parent b65f574 commit 95115bb

File tree

13 files changed

+283
-167
lines changed

13 files changed

+283
-167
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ refs/tags/0.9: 36870b185fc5f5486636d4515f0e22677493f225
2323
refs/tags/0.10: ac33f2b15782272ae348dbd7b14b8257b2148b5a
2424
refs/tags/0.11.0: e1247cb1d0d681be034adb4b558b5a0c0d5720f9
2525
refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
26-
refs/heads/beta: 12216b7209431ae2a53d52c3a41c0d3536ab2210
26+
refs/heads/beta: 983d2b3d1a97846c90ea8f689774be8353b340be
2727
refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
2828
refs/heads/tmp: 370fe2786109360f7c35b8ba552b83b773dd71d6
2929
refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f

branches/beta/configure

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -607,6 +607,10 @@ valopt aarch64-linux-android-ndk "" "aarch64-linux-android NDK standalone path"
607607
valopt release-channel "dev" "the name of the release channel to build"
608608
valopt musl-root "/usr/local" "MUSL root installation directory"
609609

610+
# Used on systems where "cc" and "ar" are unavailable
611+
valopt default-linker "cc" "the default linker"
612+
valopt default-ar "ar" "the default ar"
613+
610614
# Many of these are saved below during the "writing configuration" step
611615
# (others are conditionally saved).
612616
opt_nosave manage-submodules 1 "let the build manage the git submodules"

branches/beta/mk/target.mk

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@
1313
# this exists can be found on issue #2400
1414
export CFG_COMPILER_HOST_TRIPLE
1515

16+
# Used as defaults for the runtime ar and cc tools
17+
export CFG_DEFAULT_LINKER
18+
export CFG_DEFAULT_AR
19+
1620
# The standard libraries should be held up to a higher standard than any old
1721
# code, make sure that these common warnings are denied by default. These can
1822
# be overridden during development temporarily. For stage0, we allow warnings

0 commit comments

Comments
 (0)