Skip to content

Commit cb6a3a0

Browse files
faze-geekfaze-geek
authored
Merge branch 'main' into change_cmake
2 parents 8f048f5 + e8b84c1 commit cb6a3a0

File tree

3 files changed

+15
-18
lines changed

3 files changed

+15
-18
lines changed

‎README.md‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -126,8 +126,8 @@ command
126126
```bash
127127
mkdir build
128128
cd build
129-
cmake -DLLVM_ENABLE_PROJECTS="clang;lld" \
130-
-DLLVM_TARGETS_TO_BUILD="WebAssembly;host;NVPTX" \
129+
cmake -DLLVM_ENABLE_PROJECTS=clang \
130+
-DLLVM_TARGETS_TO_BUILD="host;NVPTX" \
131131
-DCMAKE_BUILD_TYPE=Release \
132132
-DLLVM_ENABLE_ASSERTIONS=ON \
133133
-DCLANG_ENABLE_STATIC_ANALYZER=OFF \
@@ -138,7 +138,7 @@ cmake -DLLVM_ENABLE_PROJECTS="clang;lld" \
138138
-DLLVM_ENABLE_TERMINFO=OFF \
139139
-DLLVM_ENABLE_LIBXML2=OFF \
140140
../llvm
141-
cmake --build . --target clang clang-repl lld --parallel $(nproc --all)
141+
cmake --build . --target clang clang-repl --parallel $(nproc --all)
142142
```
143143

144144
On Windows you would do this by executing the following
@@ -190,10 +190,10 @@ cd ..
190190
git clone --depth=1 -b cling-llvm13 https://github.com/root-project/llvm-project.git
191191
mkdir llvm-project/build
192192
cd llvm-project/build
193-
cmake -DLLVM_ENABLE_PROJECTS="clang;lld" \
193+
cmake -DLLVM_ENABLE_PROJECTS=clang \
194194
-DLLVM_EXTERNAL_PROJECTS=cling \
195195
-DLLVM_EXTERNAL_CLING_SOURCE_DIR=../../cling \
196-
-DLLVM_TARGETS_TO_BUILD="WebAssembly;host;NVPTX" \
196+
-DLLVM_TARGETS_TO_BUILD="host;NVPTX" \
197197
-DCMAKE_BUILD_TYPE=Release \
198198
-DLLVM_ENABLE_ASSERTIONS=ON \
199199
-DCLANG_ENABLE_STATIC_ANALYZER=OFF \
@@ -204,7 +204,6 @@ cmake -DLLVM_ENABLE_PROJECTS="clang;lld" \
204204
-DLLVM_ENABLE_TERMINFO=OFF \
205205
-DLLVM_ENABLE_LIBXML2=OFF \
206206
../llvm
207-
cmake --build . --target lld --parallel $(nproc --all)
208207
cmake --build . --target clang --parallel $(nproc --all)
209208
cmake --build . --target cling --parallel $(nproc --all)
210209
cmake --build . --target gtest_main --parallel $(nproc --all)

‎docs/DevelopersDocumentation.rst‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@ following command
7070
7171
mkdir build
7272
cd build
73-
cmake -DLLVM_ENABLE_PROJECTS="clang;lld" \
74-
-DLLVM_TARGETS_TO_BUILD="WebAssembly;host;NVPTX" \
73+
cmake -DLLVM_ENABLE_PROJECTS=clang \
74+
-DLLVM_TARGETS_TO_BUILD="host;NVPTX" \
7575
-DCMAKE_BUILD_TYPE=Release \
7676
-DLLVM_ENABLE_ASSERTIONS=ON \
7777
-DCLANG_ENABLE_STATIC_ANALYZER=OFF \
@@ -82,7 +82,7 @@ following command
8282
-DLLVM_ENABLE_TERMINFO=OFF \
8383
-DLLVM_ENABLE_LIBXML2=OFF \
8484
../llvm
85-
cmake --build . --target clang clang-repl lld --parallel $(nproc --all)
85+
cmake --build . --target clang clang-repl --parallel $(nproc --all)
8686
8787
On Windows you would do this by executing the following
8888

@@ -137,10 +137,10 @@ build instructions to build on Linux and MacOS
137137
git clone --depth=1 -b cling-llvm13 https://github.com/root-project/llvm-project.git
138138
mkdir llvm-project/build
139139
cd llvm-project/build
140-
cmake -DLLVM_ENABLE_PROJECTS="clang;lld" \
140+
cmake -DLLVM_ENABLE_PROJECTS=clang \
141141
-DLLVM_EXTERNAL_PROJECTS=cling \
142142
-DLLVM_EXTERNAL_CLING_SOURCE_DIR=../../cling \
143-
-DLLVM_TARGETS_TO_BUILD="WebAssembly;host;NVPTX" \
143+
-DLLVM_TARGETS_TO_BUILD="host;NVPTX" \
144144
-DCMAKE_BUILD_TYPE=Release \
145145
-DLLVM_ENABLE_ASSERTIONS=ON \
146146
-DCLANG_ENABLE_STATIC_ANALYZER=OFF \
@@ -151,7 +151,6 @@ build instructions to build on Linux and MacOS
151151
-DLLVM_ENABLE_TERMINFO=OFF \
152152
-DLLVM_ENABLE_LIBXML2=OFF \
153153
../llvm
154-
cmake --build . --target lld --parallel $(nproc --all)
155154
cmake --build . --target clang --parallel $(nproc --all)
156155
cmake --build . --target cling --parallel $(nproc --all)
157156
cmake --build . --target gtest_main --parallel $(nproc --all)

‎docs/InstallationAndUsage.rst‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@ following command
7070
7171
mkdir build
7272
cd build
73-
cmake -DLLVM_ENABLE_PROJECTS="clang;lld" \
74-
-DLLVM_TARGETS_TO_BUILD="WebAssembly;host;NVPTX" \
73+
cmake -DLLVM_ENABLE_PROJECTS=clang \
74+
-DLLVM_TARGETS_TO_BUILD="host;NVPTX" \
7575
-DCMAKE_BUILD_TYPE=Release \
7676
-DLLVM_ENABLE_ASSERTIONS=ON \
7777
-DCLANG_ENABLE_STATIC_ANALYZER=OFF \
@@ -82,7 +82,7 @@ following command
8282
-DLLVM_ENABLE_TERMINFO=OFF \
8383
-DLLVM_ENABLE_LIBXML2=OFF \
8484
../llvm
85-
cmake --build . --target clang clang-repl lld --parallel $(nproc --all)
85+
cmake --build . --target clang clang-repl --parallel $(nproc --all)
8686
8787
On Windows you would do this by executing the following
8888

@@ -137,10 +137,10 @@ build instructions to build on Linux and MacOS
137137
git clone --depth=1 -b cling-llvm13 https://github.com/root-project/llvm-project.git
138138
mkdir llvm-project/build
139139
cd llvm-project/build
140-
cmake -DLLVM_ENABLE_PROJECTS="clang;lld" \
140+
cmake -DLLVM_ENABLE_PROJECTS=clang \
141141
-DLLVM_EXTERNAL_PROJECTS=cling \
142142
-DLLVM_EXTERNAL_CLING_SOURCE_DIR=../../cling \
143-
-DLLVM_TARGETS_TO_BUILD="WebAssembly;host;NVPTX" \
143+
-DLLVM_TARGETS_TO_BUILD="host;NVPTX" \
144144
-DCMAKE_BUILD_TYPE=Release \
145145
-DLLVM_ENABLE_ASSERTIONS=ON \
146146
-DCLANG_ENABLE_STATIC_ANALYZER=OFF \
@@ -151,7 +151,6 @@ build instructions to build on Linux and MacOS
151151
-DLLVM_ENABLE_TERMINFO=OFF \
152152
-DLLVM_ENABLE_LIBXML2=OFF \
153153
../llvm
154-
cmake --build . --target lld --parallel $(nproc --all)
155154
cmake --build . --target clang --parallel $(nproc --all)
156155
cmake --build . --target cling --parallel $(nproc --all)
157156
cmake --build . --target gtest_main --parallel $(nproc --all)

0 commit comments

Comments
 (0)