mirror of
https://github.com/microsoft/WSL.git
synced 2025-12-10 00:44:55 -06:00
spelling: libraries (#12958)
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
This commit is contained in:
parent
83d14de518
commit
6703980dc8
@ -364,7 +364,7 @@ set(LINUX_LDFLAGS -target ${LLVM_TARGET}
|
|||||||
-l:libc.a
|
-l:libc.a
|
||||||
-static)
|
-static)
|
||||||
|
|
||||||
set(COMMON_LINUX_LINK_LIBRAIRIES configfile)
|
set(COMMON_LINUX_LINK_LIBRARIES configfile)
|
||||||
|
|
||||||
if(DEFINED ENV{WSL_DEV_BINARY_PATH})
|
if(DEFINED ENV{WSL_DEV_BINARY_PATH})
|
||||||
set(WSL_DEV_BINARY_PATH $ENV{WSL_DEV_BINARY_PATH})
|
set(WSL_DEV_BINARY_PATH $ENV{WSL_DEV_BINARY_PATH})
|
||||||
|
|||||||
@ -59,17 +59,17 @@ function(add_linux_library_no_sources target sources headers)
|
|||||||
endfunction()
|
endfunction()
|
||||||
|
|
||||||
|
|
||||||
function(add_linux_executable target sources headers librairies)
|
function(add_linux_executable target sources headers libraries)
|
||||||
set(output "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CMAKE_BUILD_TYPE}/${target}")
|
set(output "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CMAKE_BUILD_TYPE}/${target}")
|
||||||
set(output_unstripped "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CMAKE_BUILD_TYPE}/${target}.unstripped")
|
set(output_unstripped "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CMAKE_BUILD_TYPE}/${target}.unstripped")
|
||||||
|
|
||||||
build_linux_objects("${sources}" "${headers}")
|
build_linux_objects("${sources}" "${headers}")
|
||||||
|
|
||||||
set(libs -lunwind -lc++abi -lc++)
|
set(libs -lunwind -lc++abi -lc++)
|
||||||
foreach(e ${librairies})
|
foreach(e ${libraries})
|
||||||
set(libs ${libs} -l${e})
|
set(libs ${libs} -l${e})
|
||||||
|
|
||||||
# Note: This makes the assumption that all librairies are static (.a and not .so).
|
# Note: This makes the assumption that all libraries are static (.a and not .so).
|
||||||
# Executables need to depend on both the target and the underlying library file, so that
|
# Executables need to depend on both the target and the underlying library file, so that
|
||||||
# the libraries target get analyzed for changes, and the executable gets linked again if the .a files changed.
|
# the libraries target get analyzed for changes, and the executable gets linked again if the .a files changed.
|
||||||
list(APPEND lib_targets "lib${e}")
|
list(APPEND lib_targets "lib${e}")
|
||||||
|
|||||||
@ -46,8 +46,8 @@ set(HEADERS
|
|||||||
wslpath.h)
|
wslpath.h)
|
||||||
|
|
||||||
set(LINUX_CXXFLAGS ${LINUX_CXXFLAGS} -I "${CMAKE_CURRENT_LIST_DIR}/../netlinkutil")
|
set(LINUX_CXXFLAGS ${LINUX_CXXFLAGS} -I "${CMAKE_CURRENT_LIST_DIR}/../netlinkutil")
|
||||||
set(INIT_LIBRAIRIES ${COMMON_LINUX_LINK_LIBRARIES} netlinkutil plan9 mountutil configfile)
|
set(INIT_LIBRARIES ${COMMON_LINUX_LINK_LIBRARIES} netlinkutil plan9 mountutil configfile)
|
||||||
add_linux_executable(init "${SOURCES}" "${HEADERS}" "${INIT_LIBRAIRIES}")
|
add_linux_executable(init "${SOURCES}" "${HEADERS}" "${INIT_LIBRARIES}")
|
||||||
add_dependencies(init localization)
|
add_dependencies(init localization)
|
||||||
|
|
||||||
set(INITRAMFS ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CMAKE_BUILD_TYPE}/initrd.img)
|
set(INITRAMFS ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CMAKE_BUILD_TYPE}/initrd.img)
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user