Merge pull request #211077 from emilytrau/tinygo-0.26.0

tinygo: 0.25.0 -> 0.26.0
This commit is contained in:
Nick Cao 2023-01-17 08:21:33 +08:00 committed by GitHub
commit 9aa87279ce
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 11 deletions

View file

@ -18,18 +18,18 @@ index 121398fa..a589988b 100644
sourceDir: func() string {
llvmDir := filepath.Join(goenv.Get("TINYGOROOT"), "llvm-project/compiler-rt/lib/builtins")
diff --git a/builder/picolibc.go b/builder/picolibc.go
index f1b061ae..159f90cf 100644
index d0786ee3..9a5cf9b0 100644
--- a/builder/picolibc.go
+++ b/builder/picolibc.go
@@ -27,7 +27,7 @@ var Picolibc = Library{
"-D_COMPILING_NEWLIB",
"-DHAVE_ALIAS_ATTRIBUTE",
"-DTINY_STDIO",
@@ -30,7 +30,7 @@ var Picolibc = Library{
"-D_IEEE_LIBM",
"-D__OBSOLETE_MATH_FLOAT=1", // use old math code that doesn't expect a FPU
"-D__OBSOLETE_MATH_DOUBLE=0",
- "-nostdlibinc",
+ "-isystem", "@clang_include@",
"-isystem", picolibcDir + "/include",
"-I" + picolibcDir + "/tinystdio",
"-I" + headerPath,
"-isystem", newlibDir + "/libc/include",
"-I" + newlibDir + "/libc/tinystdio",
"-I" + newlibDir + "/libm/common",
diff --git a/compileopts/config.go b/compileopts/config.go
index a006b673..3a105b49 100644
--- a/compileopts/config.go

View file

@ -28,17 +28,17 @@ in
buildGoModule rec {
pname = "tinygo";
version = "0.25.0";
version = "0.26.0";
src = fetchFromGitHub {
owner = "tinygo-org";
repo = "tinygo";
rev = "v${version}";
sha256 = "sha256-Rxdxum1UIaz8tpEAGqpLvKd25nHdj4Se+IoN29EJEHg=";
sha256 = "rI8CADPWKdNvfknEsrpp2pCeZobf9fAp0GDIWjupzZA=";
fetchSubmodules = true;
};
vendorSha256 = "sha256-QxLY4KT05PtA/W7d1vKxsq5w35YZ6MJL3Lh726b+E9w=";
vendorSha256 = "sha256-ihQd/RAjAQhgQZHbNiWmAD0eOo1MvqAR/OwIOUWtdAM=";
patches = [
./0001-Makefile.patch