Skip to content

Commit 1dfc139

Browse files
committed
Resolve merge conflict in build.sh
1 parent 4e68e8a commit 1dfc139

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

ci/build.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,9 @@ function usage {
7272
echo " --prefix: Build directory prefix (Defaults to <repo_root>/build)"
7373
echo " -i/--infix: Build directory infix (Defaults to local)"
7474
echo " -d/--debug: Debug build"
75-
echo " -p/--parallel: Build parallelism (Defaults to $PARALLEL_LEVEL if set, otherwise the system's number of CPU cores)"
76-
echo " --cuda: CUDA compiler (Defaults to $CUDACXX if set, otherwise nvcc)"
77-
echo " --cxx: Host compiler (Defaults to $CXX if set, otherwise g++)"
75+
echo " -p/--parallel: Build parallelism (Defaults to \$PARALLEL_LEVEL if set, otherwise the system's number of CPU cores)"
76+
echo " --cuda: CUDA compiler (Defaults to \$CUDACXX if set, otherwise nvcc)"
77+
echo " --cxx: Host compiler (Defaults to \$CXX if set, otherwise g++)"
7878
echo " --arch: Target CUDA arches, e.g. \"60-real;70;80-virtual\" (Defaults to the system's native GPU archs)"
7979
echo " --std: CUDA/C++ standard (Defaults to 17)"
8080
echo " -v/-verbose/--verbose: Enable shell echo for debugging"

0 commit comments

Comments
 (0)