diff --git a/docs/building/internals.md b/docs/building/internals.md index f9bc607295..fdf344b998 100644 --- a/docs/building/internals.md +++ b/docs/building/internals.md @@ -13,14 +13,14 @@ Top directory We are calling `dotnet` tool build for `$Top` directory -- `src\powershell` for CoreCLR builds (all platforms) +- `src\powershell-windows` for CoreCLR on Windows. +- `src\powershell-unix` for CoreCLR on Linux and OS X. - `src\Microsoft.PowerShell.ConsoleHost` for FullCLR builds (Windows only) - ### Dummy dependencies We use dummy dependencies between project.json files to leverage `dotnet` build functionality. -For example, `src\Microsoft.PowerShell.ConsoleHost\project.json` has dependency on `Microsoft.PowerShell.PSReadLine`, +For example, `src\powershell-windows\project.json` has dependency on `Microsoft.PowerShell.PSReadLine`, but in reality, there is no build dependency. Dummy dependencies allows us to build just `$Top` folder, instead of building several folders. @@ -31,4 +31,4 @@ Dummy dependencies allows us to build just `$Top` folder, instead of building se it should be listed as a dependency for FullCLR $Top folder (src\Microsoft.PowerShell.ConsoleHost) * If assembly is part of CoreCLR build, -it should be listed as a dependency for CoreCLR $Top folder (src\powershell) +it should be listed as a dependency for $Top folder (src\powershell-unix or src\powershell-windows) diff --git a/src/libpsl-native/CMakeLists.txt b/src/libpsl-native/CMakeLists.txt index 9193d6fabf..fc26a5b91c 100644 --- a/src/libpsl-native/CMakeLists.txt +++ b/src/libpsl-native/CMakeLists.txt @@ -3,7 +3,7 @@ project(PSL-NATIVE) # Can't use add_compile_options with 2.8.11 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -Werror") -set(LIBRARY_OUTPUT_PATH "${PROJECT_SOURCE_DIR}/../powershell") +set(LIBRARY_OUTPUT_PATH "${PROJECT_SOURCE_DIR}/../powershell-unix") # test in BUILD_DIR enable_testing()