Fix <prefix>clang++.cmd script.

The clang++ script was clobbering the clang one. Test: ./checkbuild.py --system windows64 toolchain # check scripts Bug: android/ndk#920 Change-Id: I605cb47fa7ec3156d3a84eda1ea3918a47400f05
wimal-build · Feb 27, 2019 · 1d395bf · 1d395bf
1 parent 0707518
commit 1d395bf
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/docs/changelogs/Changelog-r19.md b/docs/changelogs/Changelog-r19.md
@@ -63,8 +63,10 @@ r19c
 
  * [Issue 912]: Prevent the CMake toolchain file from clobbering a user
    specified `CMAKE_FIND_ROOT_PATH`.
+ * [Issue 920]: Fix clang wrapper scripts on Windows.
 
 [Issue 912]: https://github.com/android-ndk/ndk/issues/912
+[Issue 920]: https://github.com/android-ndk/ndk/issues/920
 
 r19b
 ----

diff --git a/ndk/checkbuild.py b/ndk/checkbuild.py
@@ -1382,8 +1382,8 @@ def write_clang_wrapper(install_dir, api, triple, is_windows):
     if is_windows:
         write_clang_batch_script(wrapper_path + '.cmd', 'clang' + exe_suffix,
                                  flags)
-        write_clang_batch_script(wrapper_path + '.cmd', 'clang++' + exe_suffix,
-                                 flags)
+        write_clang_batch_script(wrapperxx_path + '.cmd',
+                                 'clang++' + exe_suffix, flags)
 
 
 class BaseToolchain(ndk.builds.Module):