Skip to content

Commit cebfcf5

Browse files
committed
replace arch to universal firstly
1 parent 39530fe commit cebfcf5

1 file changed

Lines changed: 12 additions & 10 deletions

File tree

do-install/correct-pc.sh

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -34,16 +34,6 @@ function correct_pc_file(){
3434
local include_dir="${base_dir}/include"
3535
local bin_dir="${base_dir}/bin"
3636

37-
# 全局替换 prefix= 开头后面的内容
38-
old_base=$(sed -n 's/^prefix=//p' "$pc")
39-
my_sed_i "s|$old_base|$base_dir|g" "$pc"
40-
41-
# 具有局限性,比如 includedir=/Users/matt/GitWorkspace/fsplayer/FFToolChain/build/product/ios/universal-simulator/bluray
42-
# my_sed_i "s|^prefix=.*|prefix=$base_dir|" "$pc"
43-
# my_sed_i "s|^exec_prefix=[^$].*|exec_prefix=$bin_dir|" $pc
44-
# my_sed_i "s|^libdir=[^$].*|libdir=$lib_dir|" "$pc"
45-
# my_sed_i "s|^includedir=[^$].*include|includedir=$include_dir|" "$pc"
46-
4737
# fix absolute path which contains arch suffix bug,such as /path/to/opus-arch/lib
4838
#-L/Users/runner/work/MRFFToolChainBuildShell/MRFFToolChainBuildShell/build/product/macos/opus-arch/lib
4939
#->
@@ -57,6 +47,18 @@ function correct_pc_file(){
5747

5848
my_sed_i "s|\([^/]*\)-arm64[^/]*|universal/\1|g" "$pc"
5949
my_sed_i "s|\([^/]*\)-x86[^/]*|universal/\1|g" "$pc"
50+
51+
# 全局替换 prefix= 开头后面的内容
52+
old_base=$(sed -n 's/^prefix=//p' "$pc")
53+
my_sed_i "s|$old_base|$base_dir|g" "$pc"
54+
55+
# 具有局限性,比如 includedir=/Users/matt/GitWorkspace/fsplayer/FFToolChain/build/product/ios/universal-simulator/bluray
56+
# my_sed_i "s|^prefix=.*|prefix=$base_dir|" "$pc"
57+
# my_sed_i "s|^exec_prefix=[^$].*|exec_prefix=$bin_dir|" $pc
58+
# my_sed_i "s|^libdir=[^$].*|libdir=$lib_dir|" "$pc"
59+
# my_sed_i "s|^includedir=[^$].*include|includedir=$include_dir|" "$pc"
60+
61+
6062

6163
# Fix absolute paths to other internal dependencies
6264
# Pattern: -L/any/path/PRODUCT_NAME/PLATFORM/universal/LIB_NAME/lib

0 commit comments

Comments
 (0)