Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Explicit update/init only LLVM BTLS repro on external MSVC build. #17691

Merged
merged 1 commit into from
Nov 6, 2019
Merged

Explicit update/init only LLVM BTLS repro on external MSVC build. #17691

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 8 additions & 16 deletions msvc/build-external-btls.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,16 +110,6 @@ if "%FORCE_MSBUILD%" == "" (
set FORCE_MSBUILD=false
)

if not exist "%MONO_BTLS_DIR%" (
echo Could not find "%MONO_BTLS_DIR%".
goto ON_ERROR
)

if not exist "%BTLS_DIR%" (
echo Could not find "%BTLS_DIR%".
goto ON_ERROR
)

set BTLS_CFLAGS=%VS_CFLAGS%
set BTLS_ARCH=x86_64
if /i "%VS_PLATFORM%" == "win32" (
Expand Down Expand Up @@ -245,17 +235,19 @@ if "%GIT%" == "" (
)

:: Make sure boringssl submodule is up to date.
pushd
cd "%BTLS_DIR%"
"%GIT%" submodule update --init
"%GIT%" submodule update --init -- "%BTLS_DIR%"
if not ERRORLEVEL == 0 (
"%GIT%" submodule init
"%GIT%" submodule update
"%GIT%" submodule init -- "%BTLS_DIR%"
"%GIT%" submodule update -- "%BTLS_DIR%"
if not ERRORLEVEL == 0 (
echo Git boringssl submodules failed to updated. You may experience compilation problems if some submodules are out of date.
)
)
popd

if not exist "%BTLS_DIR%" (
echo Could not find "%BTLS_DIR%".
goto ON_ERROR
)

if not exist "%BTLS_BUILD_DIR%" (
mkdir "%BTLS_BUILD_DIR%"
Expand Down
19 changes: 8 additions & 11 deletions msvc/build-external-llvm.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,11 +114,6 @@ if "%FORCE_MSBUILD%" == "" (
set FORCE_MSBUILD=false
)

if not exist "%LLVM_DIR%" (
echo Could not find "%LLVM_DIR%".
goto ON_ERROR
)

set LLVM_CFLAGS=%VS_CFLAGS%
set LLVM_ARCH=x86_64
if /i "%VS_PLATFORM%" == "win32" (
Expand Down Expand Up @@ -244,17 +239,19 @@ if "%GIT%" == "" (
)

:: Make sure llvm submodule is up to date.
pushd
cd "%LLVM_DIR%"
"%GIT%" submodule update --init
"%GIT%" submodule update --init -- "%LLVM_DIR%"
if not ERRORLEVEL == 0 (
"%GIT%" submodule init
"%GIT%" submodule update
"%GIT%" submodule init -- "%LLVM_DIR%"
"%GIT%" submodule update -- "%LLVM_DIR%"
if not ERRORLEVEL == 0 (
echo Git llvm submodules failed to updated. You may experience compilation problems if some submodules are out of date.
)
)
popd

if not exist "%LLVM_DIR%" (
echo Could not find "%LLVM_DIR%".
goto ON_ERROR
)

if not exist "%LLVM_BUILD_DIR%" (
mkdir "%LLVM_BUILD_DIR%"
Expand Down