2018-10-24 18:24:11 +00:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: Aleksei Kuzmin <alkuzmin@microsoft.com>
|
|
|
|
|
Date: Mon, 22 Oct 2018 10:45:25 -0700
|
|
|
|
|
Subject: fix_build_on_linux_x86.patch
|
|
|
|
|
|
|
|
|
|
Builds on Linux x86 fail with a clang error. See https://crbug.com/796379.
|
|
|
|
|
Once it's fixed the patch can be removed.
|
|
|
|
|
|
2018-09-14 05:02:16 +00:00
|
|
|
diff --git a/BUILD.gn b/BUILD.gn
|
2018-10-24 18:24:11 +00:00
|
|
|
index 947deba96107c931582007ce89917f8896923a6f..7afd535cb5e43762a14c51dd7b3b163571958d9c 100755
|
2018-09-14 05:02:16 +00:00
|
|
|
--- a/BUILD.gn
|
|
|
|
|
+++ b/BUILD.gn
|
2018-09-14 18:03:43 +00:00
|
|
|
@@ -239,7 +239,7 @@ target(link_target_type, "ffmpeg_internal") {
|
|
|
|
|
# Windows builds can't compile without EBP because we can't omit frame
|
|
|
|
|
# pointers like we do on posix.
|
|
|
|
|
if (target_cpu == "x86") {
|
|
|
|
|
- if (using_sanitizer || is_win) {
|
|
|
|
|
+ if (using_sanitizer || is_win || is_electron_build) {
|
|
|
|
|
defines += [ "HAVE_EBP_AVAILABLE=0" ]
|
|
|
|
|
} else {
|
|
|
|
|
defines += [ "HAVE_EBP_AVAILABLE=1" ]
|
