diff options
Diffstat (limited to 'pkgs/development/compilers/tinygo/0002-Add-clang-header-path.patch')
| -rw-r--r-- | pkgs/development/compilers/tinygo/0002-Add-clang-header-path.patch | 55 |
1 files changed, 55 insertions, 0 deletions
diff --git a/pkgs/development/compilers/tinygo/0002-Add-clang-header-path.patch b/pkgs/development/compilers/tinygo/0002-Add-clang-header-path.patch new file mode 100644 index 00000000000..875a2521a92 --- /dev/null +++ b/pkgs/development/compilers/tinygo/0002-Add-clang-header-path.patch @@ -0,0 +1,55 @@ +From 4ee942ccc7cdb06ee51490e9cb44ecb36b25378a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Mustafa=20=C3=87al=C4=B1=C5=9Fkan?= <muscaln@protonmail.com> +Date: Sat, 30 Apr 2022 16:18:31 +0300 +Subject: [PATCH 2/3] Add clang header path + + +diff --git a/builder/builtins.go b/builder/builtins.go +index 479b541d..b35283c6 100644 +--- a/builder/builtins.go ++++ b/builder/builtins.go +@@ -164,7 +164,7 @@ var aeabiBuiltins = []string{ + var CompilerRT = Library{ + name: "compiler-rt", + cflags: func(target, headerPath string) []string { +- return []string{"-Werror", "-Wall", "-std=c11", "-nostdlibinc"} ++ return []string{"-Werror", "-Wall", "-std=c11", "-isystem", "@clang_include@"} + }, + 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 +--- a/builder/picolibc.go ++++ b/builder/picolibc.go +@@ -27,7 +27,7 @@ var Picolibc = Library{ + "-D_COMPILING_NEWLIB", + "-DHAVE_ALIAS_ATTRIBUTE", + "-DTINY_STDIO", +- "-nostdlibinc", ++ "-isystem", "@clang_include@", + "-isystem", picolibcDir + "/include", + "-I" + picolibcDir + "/tinystdio", + "-I" + headerPath, +diff --git a/compileopts/config.go b/compileopts/config.go +index b30e653e..7561b3f2 100644 +--- a/compileopts/config.go ++++ b/compileopts/config.go +@@ -288,6 +288,7 @@ func (c *Config) CFlags() []string { + path, _ := c.LibcPath("picolibc") + cflags = append(cflags, + "--sysroot="+path, ++ "-isystem", "@clang_include@", + "-isystem", filepath.Join(path, "include"), // necessary for Xtensa + "-isystem", filepath.Join(picolibcDir, "include"), + "-isystem", filepath.Join(picolibcDir, "tinystdio"), +@@ -297,7 +298,6 @@ func (c *Config) CFlags() []string { + path, _ := c.LibcPath("musl") + arch := MuslArchitecture(c.Triple()) + cflags = append(cflags, +- "-nostdlibinc", + "-isystem", filepath.Join(path, "include"), + "-isystem", filepath.Join(root, "lib", "musl", "arch", arch), + "-isystem", filepath.Join(root, "lib", "musl", "include"), +-- +2.36.0 + |