Skip to content

Commit

Permalink
9.4.146.24的use_custom_libcxx和之前保持一致,也就是除了android明确设置为false,其它都为默认值
Browse files Browse the repository at this point in the history
  • Loading branch information
chexiongsheng committed Aug 27, 2024
1 parent 8f6cec7 commit d72d01b
Show file tree
Hide file tree
Showing 11 changed files with 30 additions and 0 deletions.
2 changes: 2 additions & 0 deletions ios.sh
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ if [ "$NEW_WRAP" == "with_new_wrap" ]; then
brew install llvm
export PATH="/usr/local/opt/llvm/bin:$PATH"
CXX_SETTING="use_custom_libcxx=true"
elif [ "$VERSION" == "9.4.146.24" ]; then
CXX_SETTING=""
fi

echo "=====[ add ArrayBuffer_New_Without_Stl ]====="
Expand Down
2 changes: 2 additions & 0 deletions linux.sh
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,8 @@ if [ "$NEW_WRAP" == "with_new_wrap" ]; then
echo "=====[ wrap new delete ]====="
sudo apt-get install -y llvm
CXX_SETTING="use_custom_libcxx=true"
elif [ "$VERSION" == "9.4.146.24" ]; then
CXX_SETTING=""
fi

echo "=====[ add ArrayBuffer_New_Without_Stl ]====="
Expand Down
2 changes: 2 additions & 0 deletions linux_arm64.sh
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,8 @@ if [ "$NEW_WRAP" == "with_new_wrap" ]; then
echo "=====[ wrap new delete ]====="
sudo apt-get install -y llvm
CXX_SETTING="use_custom_libcxx=true"
elif [ "$VERSION" == "9.4.146.24" ]; then
CXX_SETTING=""
fi

echo "=====[ add ArrayBuffer_New_Without_Stl ]====="
Expand Down
2 changes: 2 additions & 0 deletions macos.sh
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ if [ "$NEW_WRAP" == "with_new_wrap" ]; then
brew install llvm
export PATH="/usr/local/opt/llvm/bin:$PATH"
CXX_SETTING="use_custom_libcxx=true"
elif [ "$VERSION" == "9.4.146.24" ]; then
CXX_SETTING=""
fi

echo "=====[ add ArrayBuffer_New_Without_Stl ]====="
Expand Down
2 changes: 2 additions & 0 deletions macos_DLL.sh
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ if [ "$NEW_WRAP" == "with_new_wrap" ]; then
brew install llvm
export PATH="/usr/local/opt/llvm/bin:$PATH"
CXX_SETTING="use_custom_libcxx=true libcxx_is_shared=false"
elif [ "$VERSION" == "9.4.146.24" ]; then
CXX_SETTING=""
fi

echo "=====[ add ArrayBuffer_New_Without_Stl ]====="
Expand Down
2 changes: 2 additions & 0 deletions macos_arm64.sh
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ if [ "$NEW_WRAP" == "with_new_wrap" ]; then
brew install llvm
export PATH="/usr/local/opt/llvm/bin:$PATH"
CXX_SETTING="use_custom_libcxx=true"
elif [ "$VERSION" == "9.4.146.24" ]; then
CXX_SETTING=""
fi

echo "=====[ add ArrayBuffer_New_Without_Stl ]====="
Expand Down
2 changes: 2 additions & 0 deletions macos_arm64_DLL.sh
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ if [ "$NEW_WRAP" == "with_new_wrap" ]; then
brew install llvm
export PATH="/usr/local/opt/llvm/bin:$PATH"
CXX_SETTING="use_custom_libcxx=true libcxx_is_shared=false"
elif [ "$VERSION" == "9.4.146.24" ]; then
CXX_SETTING=""
fi

echo "=====[ add ArrayBuffer_New_Without_Stl ]====="
Expand Down
4 changes: 4 additions & 0 deletions windows_32.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,10 @@ if "%NEW_WRAP%"=="with_new_wrap" (
set "CXX_SETTING=is_clang=true use_custom_libcxx=true"
)

if "%VERSION%"=="9.4.146.24" (
set "CXX_SETTING=is_clang=false"
)

@REM echo =====[ Patching V8 ]=====
@REM node %GITHUB_WORKSPACE%\CRLF2LF.js %GITHUB_WORKSPACE%\patches\builtins-puerts.patches
@REM call git apply --cached --reject %GITHUB_WORKSPACE%\patches\builtins-puerts.patches
Expand Down
4 changes: 4 additions & 0 deletions windows_64.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,10 @@ if "%NEW_WRAP%"=="with_new_wrap" (
set "CXX_SETTING=is_clang=true use_custom_libcxx=true"
)

if "%VERSION%"=="9.4.146.24" (
set "CXX_SETTING=is_clang=false"
)

echo =====[ add ArrayBuffer_New_Without_Stl ]=====
node %~dp0\node-script\add_arraybuffer_new_without_stl.js . %VERSION% %NEW_WRAP%

Expand Down
4 changes: 4 additions & 0 deletions windows_64MD.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,10 @@ if "%NEW_WRAP%"=="with_new_wrap" (
set "CXX_SETTING=is_clang=true use_custom_libcxx=true"
)

if "%VERSION%"=="9.4.146.24" (
set "CXX_SETTING=is_clang=false"
)

@REM echo =====[ Patching V8 ]=====
@REM node %GITHUB_WORKSPACE%\CRLF2LF.js %GITHUB_WORKSPACE%\patches\builtins-puerts.patches
@REM call git apply --cached --reject %GITHUB_WORKSPACE%\patches\builtins-puerts.patches
Expand Down
4 changes: 4 additions & 0 deletions windows_64MD_DLL_94.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,10 @@ if "%NEW_WRAP%"=="with_new_wrap" (
set "CXX_SETTING=is_clang=true use_custom_libcxx=true libcxx_is_shared=false"
)

if "%VERSION%"=="9.4.146.24" (
set "CXX_SETTING=is_clang=false"
)

echo =====[ Make dynamic_crt ]=====
node %~dp0\node-script\rep.js build\config\win\BUILD.gn

Expand Down

0 comments on commit d72d01b

Please sign in to comment.