max/lean4-htt
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

fix(CMakeLists): complete move of stage1 from src/ to build dir

Browse source
This commit is contained in:
Sebastian Ullrich 2019-03-21 10:12:56 +01:00
parent 4a3cc12a13
commit beae045ebc
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/make/index.md
View file

@ -83,7 +83,7 @@ building Lean itself - which is needed to again build those parts. Building the
`.olean` object files as well as extracted to C++ in `src/stage1` by the
target `stdlib`.
* The target `build_libleanstdlib` builds the static library
`src/stage1/libleanstdlib.a` from the extracted files.
`stage1/libleanstdlib.a` from the extracted files.
* This library is linked with the C++ source files into `libleanstatic.a` and
ultimately into the executable `lean`.
* The `bin` target finally copies the executable and libraries into `bin/`.

2
library/Makefile.in
View file

@ -32,7 +32,7 @@ depends: $(DEPS)
clean:
find . -name *.olean -delete
find . -name *.depend -delete
[ -d $(STAGE1_DIR) ] && find $(STAGE1_DIR) -name *.cpp -delete
[ -d "$(STAGE1_DIR)" ] && rm -r "$(STAGE1_DIR)"
$(STAGE1_DIR)/%.cpp: %.olean
@

4
src/CMakeLists.txt
View file

@ -455,12 +455,12 @@ add_library(leanstatic_stage0 ${LEAN_LIBRARY_TYPE} ${LEAN_OBJS} $<TARGET_OBJECTS
target_link_libraries(leanstatic_stage0 ${EXTRA_LIBS})
add_library(leanstatic ${LEAN_LIBRARY_TYPE} ${LEAN_OBJS})
target_link_libraries(leanstatic "${LEAN_SOURCE_DIR}/stage1/libleanstdlib.a" ${EXTRA_LIBS})
target_link_libraries(leanstatic "${CMAKE_BINARY_DIR}/stage1/libleanstdlib.a" ${EXTRA_LIBS})
add_dependencies(leanstatic stdlib)
ADD_CUSTOM_TARGET(bin_lib ALL
COMMAND "${CMAKE_COMMAND}" -E make_directory "${LEAN_SOURCE_DIR}/../bin"
COMMAND "${CMAKE_COMMAND}" -E copy ${COPY_LIBS} "${LEAN_SOURCE_DIR}/stage1/libleanstdlib*" "${CMAKE_CURRENT_BINARY_DIR}/libleanstatic*" "${LEAN_SOURCE_DIR}/../bin"
COMMAND "${CMAKE_COMMAND}" -E copy ${COPY_LIBS} "${CMAKE_BINARY_DIR}/stage1/libleanstdlib*" "${CMAKE_CURRENT_BINARY_DIR}/libleanstatic*" "${LEAN_SOURCE_DIR}/../bin"
DEPENDS leanstatic
)
# Configure leanc

2
src/shell/CMakeLists.txt
View file

@ -8,7 +8,7 @@ endif()
add_custom_target(stdlib
# '-G Ninja' complains otherwise
BYPRODUCTS "${LEAN_SOURCE_DIR}/stage1/libleanstdlib.a"
BYPRODUCTS "${CMAKE_BINARY_DIR}/stage1/libleanstdlib.a"
WORKING_DIRECTORY "${LEAN_SOURCE_DIR}/../library"
COMMAND make -j8 "${CMAKE_BINARY_DIR}/stage1/libleanstdlib.a" "LEAN=$<TARGET_FILE:lean_stage0>" "STAGE1_DIR=${CMAKE_BINARY_DIR}/stage1"
DEPENDS lean_stage0)