jimzah/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2024-11-27 07:32:44 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Don't install stage2 artifacts

Browse Source 
Fixes #2220.
This commit is contained in:
Marc Tiehuis 2019-04-18 18:58:12 +12:00 committed by Andrew Kelley
parent b4f8d68e2e
commit 81767a658d
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
CMakeLists.txt
View File

@ -58,6 +58,16 @@ endif()
set(ZIG_CPP_LIB_DIR "${CMAKE_BINARY_DIR}/zig_cpp") set(ZIG_CPP_LIB_DIR "${CMAKE_BINARY_DIR}/zig_cpp")
# Handle multi-config builds and place each into a common lib. The VS generator
# for example will append a Debug folder by default if not explicitly specified.
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${ZIG_CPP_LIB_DIR})
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${ZIG_CPP_LIB_DIR})
foreach(CONFIG_TYPE ${CMAKE_CONFIGURATION_TYPES})
string(TOUPPER ${CONFIG_TYPE} CONFIG_TYPE)
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_${CONFIG_TYPE} ${ZIG_CPP_LIB_DIR})
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_${CONFIG_TYPE} ${ZIG_CPP_LIB_DIR})
endforeach(CONFIG_TYPE CMAKE_CONFIGURATION_TYPES)
if(ZIG_FORCE_EXTERNAL_LLD) if(ZIG_FORCE_EXTERNAL_LLD)
find_package(lld) find_package(lld)
include_directories(${LLVM_INCLUDE_DIRS}) include_directories(${LLVM_INCLUDE_DIRS})
@ -253,7 +263,6 @@ else()
embedded_lld_wasm embedded_lld_wasm
embedded_lld_lib embedded_lld_lib
) )
install(TARGETS embedded_lld_elf embedded_lld_coff embedded_lld_mingw embedded_lld_wasm embedded_lld_lib DESTINATION "${ZIG_CPP_LIB_DIR}")
endif() endif()
# No patches have been applied to SoftFloat-3e # No patches have been applied to SoftFloat-3e

2
ci/azure/windows_upload
View File

@ -6,7 +6,7 @@ set -e
if [ "${BUILD_REASON}" != "PullRequest" ]; then if [ "${BUILD_REASON}" != "PullRequest" ]; then
cd "$ZIGBUILDDIR" cd "$ZIGBUILDDIR"
rm release/*.lib release/*.exe rm release/*.exe
mv ../LICENSE release/ mv ../LICENSE release/
mv ../zig-cache/langref.html release/ mv ../zig-cache/langref.html release/
mv release/bin/zig.exe release/ mv release/bin/zig.exe release/