Skip to content

Commit 7c29512

Browse files
committed
FIX Fixing critical issue in windows building.
1 parent d7019af commit 7c29512

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

targets/x86_64-pc-windows-libcmt/set-env.bat

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -113,12 +113,12 @@ if "%CMAKE_USE_ARCH_OPTIONS%" == "" (set CMAKE_GENERATOR=%CMAKE_GENERATOR%%CMAKE
113113
if not "%CMAKE_USE_ARCH_OPTIONS%" == "" (set CMAKE_OPTIONS=%CMAKE_OPTIONS%%CMAKE_ARCH_OPTIONS%)
114114

115115
set TAR_SUFFIX=.tar.xz
116-
perl windows/compare-versions.pl %LLVM_VERSION% 3.5.0
116+
perl targets/x86_64-pc-windows-libcmt/compare-versions.pl %LLVM_VERSION% 3.5.0
117117
if %errorlevel% == -1 set TAR_SUFFIX=.tar.gz
118118

119119
set BASE_DOWNLOAD_URL=https://github.com/llvm/llvm-project/releases/download/llvmorg-%LLVM_VERSION%
120120
set BASE_DOWNLOAD_URL_LEGACY=http://releases.llvm.org/%LLVM_VERSION%
121-
perl windows/compare-versions.pl %LLVM_VERSION% 7.1.0
121+
perl targets/x86_64-pc-windows-libcmt/compare-versions.pl %LLVM_VERSION% 7.1.0
122122
if %errorlevel% == -1 set BASE_DOWNLOAD_URL=%BASE_DOWNLOAD_URL_LEGACY%
123123

124124
:: exceptions: 8.0.0, 9.0.0 are still hosted on llvm.org
@@ -127,7 +127,7 @@ if %LLVM_VERSION% == 8.0.0 set BASE_DOWNLOAD_URL=%BASE_DOWNLOAD_URL_LEGACY%
127127
if %LLVM_VERSION% == 9.0.0 set BASE_DOWNLOAD_URL=%BASE_DOWNLOAD_URL_LEGACY%
128128

129129
set CLANG_DOWNLOAD_FILE_PREFIX=clang-
130-
perl windows/compare-versions.pl %LLVM_VERSION% 9.0.0
130+
perl targets/x86_64-pc-windows-libcmt/compare-versions.pl %LLVM_VERSION% 9.0.0
131131
if %errorlevel% == -1 set CLANG_DOWNLOAD_FILE_PREFIX=cfe-
132132

133133
set LLVM_MASTER_URL=https://github.com/llvm/llvm-project
@@ -141,12 +141,12 @@ set LLVM_RELEASE_DIR=%WORKING_DIR%\%LLVM_RELEASE_NAME%
141141
set LLVM_RELEASE_DIR=%LLVM_RELEASE_DIR:\=/%
142142
set LLVM_RELEASE_URL=https://github.com/vovkos/llvm-package-windows/releases/download/%LLVM_RELEASE_TAG%/%LLVM_RELEASE_FILE%
143143

144-
perl windows/compare-versions.pl %LLVM_VERSION% 15.0.0
144+
perl targets/x86_64-pc-windows-libcmt/compare-versions.pl %LLVM_VERSION% 15.0.0
145145
if %errorlevel% == -1 set LLVM_CMAKE_DOWNLOAD_URL=
146146

147147
set LLVM_CMAKE_CRT_FLAGS= -DCMAKE_MSVC_RUNTIME_LIBRARY=%CMAKE_CRT%
148148

149-
perl windows/compare-versions.pl %LLVM_VERSION% 17.0.0
149+
perl targets/x86_64-pc-windows-libcmt/compare-versions.pl %LLVM_VERSION% 17.0.0
150150
if %errorlevel% == -1 set LLVM_CMAKE_CRT_FLAGS= ^
151151
-DLLVM_USE_CRT_DEBUG=%LLVM_CRT%d ^
152152
-DLLVM_USE_CRT_RELEASE=%LLVM_CRT% ^
@@ -198,13 +198,13 @@ set CLANG_CMAKE_CONFIGURE_FLAGS= ^
198198

199199
:: . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
200200

201-
perl windows/compare-versions.pl %LLVM_VERSION% 8.0.0
201+
perl targets/x86_64-pc-windows-libcmt/compare-versions.pl %LLVM_VERSION% 8.0.0
202202
if %errorlevel% == -1 set CLANG_CMAKE_CONFIGURE_FLAGS= ^
203203
%CLANG_CMAKE_CONFIGURE_FLAGS% ^
204204
-DCLANG_PATH_TO_LLVM_BUILD=%LLVM_RELEASE_DIR% ^
205205
-DLLVM_MAIN_SRC_DIR=%LLVM_RELEASE_DIR%
206206

207-
perl windows/compare-versions.pl %LLVM_VERSION% 3.5.0
207+
perl targets/x86_64-pc-windows-libcmt/compare-versions.pl %LLVM_VERSION% 3.5.0
208208
if %errorlevel% == -1 set CLANG_CMAKE_CONFIGURE_FLAGS= ^
209209
%CLANG_CMAKE_CONFIGURE_FLAGS% ^
210210
-DLLVM_CONFIG=%LLVM_RELEASE_DIR%/bin/llvm-config

0 commit comments

Comments
 (0)