Update patches
This commit is contained in:
parent
d1104a878f
commit
aa1504e9e1
2 changed files with 8 additions and 19 deletions
|
@ -1,12 +0,0 @@
|
||||||
diff --git a/core/Common/OfficeFileFormatChecker2.cpp b/core/Common/OfficeFileFormatChecker2.cpp
|
|
||||||
index d2887d78..43c28a0b 100644
|
|
||||||
--- a/core/Common/OfficeFileFormatChecker2.cpp
|
|
||||||
+++ b/core/Common/OfficeFileFormatChecker2.cpp
|
|
||||||
@@ -44,6 +44,7 @@
|
|
||||||
|
|
||||||
#include "3dParty/pole/pole.h"
|
|
||||||
#include <algorithm>
|
|
||||||
+#include <limits>
|
|
||||||
|
|
||||||
#include "OfficeFileFormatDefines.h"
|
|
||||||
|
|
|
@ -1,12 +1,13 @@
|
||||||
--- a/build_tools/scripts/core_common/modules/v8_89.py
|
diff --git a/build_tools/scripts/core_common/modules/v8_89.py.orig b/build_tools/scripts/core_common/modules/v8_89.py
|
||||||
|
index 2c920a47..61dcafc9 100644
|
||||||
|
--- a/build_tools/scripts/core_common/modules/v8_89.py.orig
|
||||||
+++ b/build_tools/scripts/core_common/modules/v8_89.py
|
+++ b/build_tools/scripts/core_common/modules/v8_89.py
|
||||||
@@ -48,6 +48,8 @@ def make_args(args, platform, is_64=True, is_debug=False):
|
@@ -55,6 +55,8 @@ def make_args(args, platform, is_64=True, is_debug=False):
|
||||||
|
linux_clang = False
|
||||||
if (platform == "linux"):
|
if (platform == "linux"):
|
||||||
args_copy.append("is_clang=true")
|
args_copy.append("is_clang=true")
|
||||||
+ args_copy.append("clang_base_path=\\\"/usr/lib/llvm-14\\\"")
|
+ args_copy.append("clang_base_path=\\\"/usr/lib/llvm-14\\\"")
|
||||||
+ args_copy.append("clang_use_chrome_plugins=false")
|
+ args_copy.append("clang_use_chrome_plugins=false")
|
||||||
args_copy.append("use_sysroot=false")
|
if "1" == config.option("use-clang"):
|
||||||
if (platform == "windows"):
|
args_copy.append("use_sysroot=true")
|
||||||
args_copy.append("is_clang=false")
|
linux_clang = True
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue