authorgravatar for marc@tiehu.isMarc Tiehuis <marc@tiehu.is> 2019-04-18 18:58:12+12:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2019-04-30 12:13:41-04:00
log81767a658d07219a402384f98a7553abcbbd2e70
tree420dc964e2879b573e42080a1bb12bde9c159178
parentb4f8d68e2e48a27ff2a6eea6155873cdbfc8ad38

Don't install stage2 artifacts

Fixes #2220.

2 files changed, 11 insertions(+), 2 deletions(-)

CMakeLists.txt+10-1
...@@ -58,6 +58,16 @@ endif()...@@ -58,6 +58,16 @@ endif()
5858
59set(ZIG_CPP_LIB_DIR "${CMAKE_BINARY_DIR}/zig_cpp")59set(ZIG_CPP_LIB_DIR "${CMAKE_BINARY_DIR}/zig_cpp")
6060
61# Handle multi-config builds and place each into a common lib. The VS generator
62# for example will append a Debug folder by default if not explicitly specified.
63set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${ZIG_CPP_LIB_DIR})
64set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${ZIG_CPP_LIB_DIR})
65foreach(CONFIG_TYPE ${CMAKE_CONFIGURATION_TYPES})
66 string(TOUPPER ${CONFIG_TYPE} CONFIG_TYPE)
67 set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_${CONFIG_TYPE} ${ZIG_CPP_LIB_DIR})
68 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_${CONFIG_TYPE} ${ZIG_CPP_LIB_DIR})
69endforeach(CONFIG_TYPE CMAKE_CONFIGURATION_TYPES)
70
61if(ZIG_FORCE_EXTERNAL_LLD)71if(ZIG_FORCE_EXTERNAL_LLD)
62 find_package(lld)72 find_package(lld)
63 include_directories(${LLVM_INCLUDE_DIRS})73 include_directories(${LLVM_INCLUDE_DIRS})
...@@ -253,7 +263,6 @@ else()...@@ -253,7 +263,6 @@ else()
253 embedded_lld_wasm263 embedded_lld_wasm
254 embedded_lld_lib264 embedded_lld_lib
255 )265 )
256 install(TARGETS embedded_lld_elf embedded_lld_coff embedded_lld_mingw embedded_lld_wasm embedded_lld_lib DESTINATION "${ZIG_CPP_LIB_DIR}")
257endif()266endif()
258267
259# No patches have been applied to SoftFloat-3e268# No patches have been applied to SoftFloat-3e
ci/azure/windows_upload+1-1
...@@ -6,7 +6,7 @@ set -e...@@ -6,7 +6,7 @@ set -e
6if [ "${BUILD_REASON}" != "PullRequest" ]; then6if [ "${BUILD_REASON}" != "PullRequest" ]; then
7 cd "$ZIGBUILDDIR"7 cd "$ZIGBUILDDIR"
88
9 rm release/*.lib release/*.exe9 rm release/*.exe
10 mv ../LICENSE release/10 mv ../LICENSE release/
11 mv ../zig-cache/langref.html release/11 mv ../zig-cache/langref.html release/
12 mv release/bin/zig.exe release/12 mv release/bin/zig.exe release/