Fixing windows builds
diff --git a/toolchain/BUILD b/toolchain/BUILD
index 3942692..d995de5 100644
--- a/toolchain/BUILD
+++ b/toolchain/BUILD
@@ -43,7 +43,7 @@
name = "linux-aarch_64-config",
bit_flag = "-m64",
cpp_flag = "-lstdc++",
- include_flag = [
+ extra_compiler_flags = [
"-I/usr/aarch64-linux-gnu/include/c++/8/aarch64-linux-gnu/",
"-I/usr/aarch64-linux-gnu/include/c++/8"
],
@@ -58,7 +58,7 @@
name = "linux-ppcle_64-config",
bit_flag = "-m64",
cpp_flag = "-lstdc++",
- include_flag = [
+ extra_compiler_flags = [
"-I/usr/powerpc64le-linux-gnu/include/c++/8/powerpc64le-linux-gnu/",
"-I/usr/powerpc64le-linux-gnu/include/c++/8/"
],
@@ -73,7 +73,7 @@
name = "linux-s390_64-config",
bit_flag = "-m64",
cpp_flag = "-lstdc++",
- include_flag = [
+ extra_compiler_flags = [
"-I/usr/s390x-linux-gnu/include/c++/8/s390x-linux-gnu/",
"-I/usr/s390x-linux-gnu/include/c++/8/"
],
@@ -110,7 +110,7 @@
name = "osx-aarch_64-config",
bit_flag = "-m64",
cpp_flag = "-lc++",
- include_flag = [
+ extra_compiler_flags = [
"-I/usr/tools/apple_sdks/xcode_13_0/macosx/usr/include/c++/v1",
"-I/usr/tools/apple_sdks/xcode_13_0/macosx/usr/include"
],
@@ -126,7 +126,7 @@
name = "osx-x86_64-config",
bit_flag = "-m64",
cpp_flag = "-lc++",
- include_flag = [
+ extra_compiler_flags = [
"-I/usr/tools/apple_sdks/xcode_13_0/macosx/usr/include/c++/v1",
"-I/usr/tools/apple_sdks/xcode_13_0/macosx/usr/include"
],
@@ -142,12 +142,16 @@
name = "win32-config",
bit_flag = "-m32",
cpp_flag = "-lstdc++",
- extra_include = "/usr/lib/gcc/i686-w64-mingw32/10-posix/include",
- extra_linker_flag = "-L/usr/lib/gcc/i686-w64-mingw32/10-posix",
- include_flag = [
- "-I/usr/lib/gcc/i686-w64-mingw32/10-posix/include/c++",
- "-I/usr/lib/gcc/i686-w64-mingw32/10-posix/include/c++/i686-w64-mingw32",
- "-I/usr/i686-w64-mingw32/include"
+ extra_compiler_flags = [
+ "-I/usr/lib/gcc/i686-w64-mingw32/8.3-posix/include/c++",
+ "-I/usr/lib/gcc/i686-w64-mingw32/8.3-posix/include/c++/i686-w64-mingw32",
+ "-I/usr/i686-w64-mingw32/include",
+ "-fsjlj-exceptions",
+ ],
+ extra_include = "/usr/lib/gcc/i686-w64-mingw32/8.3-posix/include",
+ extra_linker_flags = [
+ "-L/usr/lib/gcc/i686-w64-mingw32/8.3-posix",
+ "-pthread",
],
linker_path = "/usr/bin/ld",
target_cpu = "x86_32",
@@ -160,13 +164,15 @@
name = "win64-config",
bit_flag = "-m64",
cpp_flag = "-lstdc++",
- extra_include = "/usr/lib/gcc/x86_64-w64-mingw32/10-posix/include",
- extra_linker_flag = "-L/usr/lib/gcc/x86_64-w64-mingw32/10-posix",
- include_flag = [
- "-I/usr/lib/gcc/x86_64-w64-mingw32/10-posix/include/c++/",
- "-I/usr/lib/gcc/x86_64-w64-mingw32/10-posix/include/c++/x86_64-w64-mingw32",
+ extra_compiler_flags = [
+ "-I/usr/lib/gcc/x86_64-w64-mingw32/8.3-posix/include/c++/",
+ "-I/usr/lib/gcc/x86_64-w64-mingw32/8.3-posix/include/c++/x86_64-w64-mingw32",
"-I/usr/x86_64-w64-mingw32/include"
],
+ extra_include = "/usr/lib/gcc/x86_64-w64-mingw32/8.3-posix/include",
+ extra_linker_flags = [
+ "-L/usr/lib/gcc/x86_64-w64-mingw32/8.3-posix",
+ ],
linker_path = "/usr/bin/ld",
target_cpu = "x86_64",
target_full_name = "x86_64-w64-mingw32",
