Skip to content

Commit 3adc387

Browse files
committed
Merge remote-tracking branch 'origin/master' into master-next
2 parents 814a28f + f5bcd7f commit 3adc387

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

docs/WindowsBuild.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,9 @@ cmake --build "S:\b\cmark"
120120
### 6. Build LLVM/Clang
121121
- This must be done from within a developer command prompt. LLVM and Clang are
122122
large projects, so building might take a few hours. Make sure that the build
123-
type (e.g. `Debug`, `Release`, `RelWithDebInfoAssert`) for LLVM/Clang matches the
124-
build type for Swift.
123+
type for LLVM/Clang is compatbile with the build type for Swift. That is,
124+
either build everything `Debug` or some variant of `Release` (e.g. `Release`,
125+
`RelWithDebInfo`).
125126
```cmd
126127
mkdir "S:\b\llvm"
127128
pushd "S:\b\llvm"
@@ -199,10 +200,8 @@ pushd "S:\b\lldb"
199200
cmake -G Ninja^
200201
-DCMAKE_BUILD_TYPE=RelWithDebInfo^
201202
-DLLDB_ALLOW_STATIC_BINDINGS=YES^
202-
-DLLDB_PATH_TO_LLVM_SOURCE="S:\llvm"^
203203
-DLLDB_PATH_TO_CLANG_SOURCE="S:\clang"^
204204
-DLLDB_PATH_TO_SWIFT_SOURCE="S:\swift"^
205-
-DLLDB_PATH_TO_CMARK_BUILD="S:\b\cmark"^
206205
-DLLDB_PATH_TO_CLANG_BUILD="S:\b\llvm"^
207206
-DLLDB_PATH_TO_LLVM_BUILD="S:\b\llvm"^
208207
-DLLDB_PATH_TO_SWIFT_BUILD="S:\b\swift"^

tools/libSwiftSyntaxParser/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ endif()
4747

4848
swift_install_in_component(parser-lib
4949
FILES "${SWIFT_LIBRARY_OUTPUT_INTDIR}/${CMAKE_SHARED_LIBRARY_PREFIX}${SYNTAX_PARSER_LIB_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}"
50+
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
5051
DESTINATION "lib${LLVM_LIBDIR_SUFFIX}/swift/${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_LIB_SUBDIR}")
5152
swift_install_in_component(parser-lib
5253
DIRECTORY "${SWIFT_MAIN_INCLUDE_DIR}/swift-c/SyntaxParser/"

0 commit comments

Comments
 (0)