Просмотр исходного кода

Merge pull request #389 from 1715173329/naive-fix

naiveproxy: backport patch to fix building on x86 platform
coolsnowwolf 4 лет назад
Родитель
Сommit
b8b5fd02f5
1 измененных файлов с 22 добавлено и 0 удалено
  1. 22 0
      naiveproxy/patches/010-Fix-OpenWrt-x86-builds.patch

+ 22 - 0
naiveproxy/patches/010-Fix-OpenWrt-x86-builds.patch

@@ -0,0 +1,22 @@
+From 63f89cd454bcd1f2cdd14e63de0587a2f692cd07 Mon Sep 17 00:00:00 2001
+From: klzgrad <[email protected]>
+Date: Sun, 31 Jan 2021 20:15:28 +0800
+Subject: [PATCH] Fix OpenWrt x86 builds
+
+---
+ src/build/toolchain/linux/BUILD.gn | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+--- a/src/build/toolchain/linux/BUILD.gn
++++ b/src/build/toolchain/linux/BUILD.gn
+@@ -99,8 +99,8 @@ clang_toolchain("clang_x86") {
+ clang_toolchain("clang_x86_openwrt") {
+   # Output linker map files for binary size analysis.
+   enable_linker_map = true
+-  extra_cppflags = "--target=i386-openwrt-linux-musl -D_LIBCPP_HAS_MUSL_LIBC -D__UCLIBC__"
+-  extra_ldflags = "--target=i386-openwrt-linux-musl"
++  extra_cppflags = "--target=i486-openwrt-linux-musl -D_LIBCPP_HAS_MUSL_LIBC -D__UCLIBC__"
++  extra_ldflags = "--target=i486-openwrt-linux-musl"
+ 
+   toolchain_args = {
+     current_cpu = "x86"