Skip to content

Commit

Permalink
Explicit update/init only LLVM BTLS repro on external MSVC build. (mo…
Browse files Browse the repository at this point in the history
…no/mono#17691)

Reduce the scope of git submodule update --init to only LLVM and/or BTLS
repositories when building external MSVC dependencies.

Commit migrated from mono/mono@1a6c092
  • Loading branch information
lateralusX authored Nov 6, 2019
1 parent 35bac72 commit 393205e
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 27 deletions.
24 changes: 8 additions & 16 deletions src/mono/msvc/build-external-btls.bat
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 src/mono/msvc/build-external-llvm.bat
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

0 comments on commit 393205e

Please sign in to comment.