authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2019-04-17 14:09:18-04:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2019-04-17 14:09:18-04:00
log4ad7d09ba5f6f021cb6b6c2045e26fe252f61a27
tree6f21f0d76204fd236e99233714dadbc67def741c
parentbc2d60c11f7e90f401a4412d3dc6fca985071169
signature Commit is signed but in an unrecognized format.

build: rename zig1 to zig0 to avoid confusion with stage1

1 files changed, 5 insertions(+), 5 deletions(-)

CMakeLists.txt+5-5
...@@ -411,7 +411,7 @@ find_package(Threads)...@@ -411,7 +411,7 @@ find_package(Threads)
411set(ZIG_MAIN_SRC "${CMAKE_SOURCE_DIR}/src/main.cpp")411set(ZIG_MAIN_SRC "${CMAKE_SOURCE_DIR}/src/main.cpp")
412412
413# This is our shim which will be replaced by libuserland written in Zig.413# This is our shim which will be replaced by libuserland written in Zig.
414set(ZIG1_SHIM_SRC "${CMAKE_SOURCE_DIR}/src/userland.cpp")414set(ZIG0_SHIM_SRC "${CMAKE_SOURCE_DIR}/src/userland.cpp")
415415
416set(ZIG_SOURCES416set(ZIG_SOURCES
417 "${CMAKE_SOURCE_DIR}/src/analyze.cpp"417 "${CMAKE_SOURCE_DIR}/src/analyze.cpp"
...@@ -6677,12 +6677,12 @@ if(MSVC OR MINGW)...@@ -6677,12 +6677,12 @@ if(MSVC OR MINGW)
6677 target_link_libraries(compiler LINK_PUBLIC version)6677 target_link_libraries(compiler LINK_PUBLIC version)
6678endif()6678endif()
66796679
6680add_executable(zig1 "${ZIG_MAIN_SRC}" "${ZIG1_SHIM_SRC}")6680add_executable(zig0 "${ZIG_MAIN_SRC}" "${ZIG0_SHIM_SRC}")
6681set_target_properties(zig1 PROPERTIES6681set_target_properties(zig0 PROPERTIES
6682 COMPILE_FLAGS ${EXE_CFLAGS}6682 COMPILE_FLAGS ${EXE_CFLAGS}
6683 LINK_FLAGS ${EXE_LDFLAGS}6683 LINK_FLAGS ${EXE_LDFLAGS}
6684)6684)
6685target_link_libraries(zig1 compiler)6685target_link_libraries(zig0 compiler)
66866686
6687if(WIN32)6687if(WIN32)
6688 set(LIBUSERLAND "${CMAKE_BINARY_DIR}/userland.lib")6688 set(LIBUSERLAND "${CMAKE_BINARY_DIR}/userland.lib")
...@@ -6693,7 +6693,7 @@ else()...@@ -6693,7 +6693,7 @@ else()
6693endif()6693endif()
6694add_custom_command(6694add_custom_command(
6695 OUTPUT "${LIBUSERLAND}"6695 OUTPUT "${LIBUSERLAND}"
6696 COMMAND zig1 ARGS build6696 COMMAND zig0 ARGS build
6697 --override-std-dir std6697 --override-std-dir std
6698 --override-lib-dir "${CMAKE_SOURCE_DIR}"6698 --override-lib-dir "${CMAKE_SOURCE_DIR}"
6699 libuserland6699 libuserland