Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix CMake checks for Apple Clang 11.0 on macOS 10.15 #8580

Merged
merged 2 commits into from
Oct 14, 2019
Merged

Fix CMake checks for Apple Clang 11.0 on macOS 10.15 #8580

merged 2 commits into from
Oct 14, 2019

Conversation

joelpelaez
Copy link
Contributor

Fix CMake checks for Apple Clang 11.0 on macOS 10.15

Related #8490

@pr0g pr0g mentioned this pull request Oct 13, 2019
Closed
@cenit
Copy link
Contributor

cenit commented Oct 14, 2019

Please add also this patch:

diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh
index d89d5a15b..55859d1f8 100644
--- a/scripts/bootstrap.sh
+++ b/scripts/bootstrap.sh
@@ -244,7 +244,7 @@ else
 fi
 if [ "$os" = "osx" ]; then
     if [ "$vcpkgAllowAppleClang" = "true" ] ; then
-        CXX=clang
+        CXX=clang++
     else
         selectCXX CXX || exit 1
     fi

since it's necessary for proper build

@joelpelaez joelpelaez force-pushed the fix_apple_clang_fs_check branch from e2f59d2 to 34ae7b1 Compare October 14, 2019 14:53
@joelpelaez
Copy link
Contributor Author

Thanks @cenit, I added it. I did a force push because I used another email in first commit.

@vicroms vicroms self-assigned this Oct 14, 2019
@vicroms vicroms added the category:vcpkg-bug The issue is with the vcpkg system (including helper scripts in `scripts/cmake/`) label Oct 14, 2019
@cbezault
Copy link
Contributor

This works for me

@dan-shaw dan-shaw merged commit db3e74f into microsoft:master Oct 14, 2019
@dan-shaw
Copy link
Contributor

Thanks for the PR!

strega-nil pushed a commit to strega-nil/vcpkg that referenced this pull request May 5, 2021
@joelpelaez @dan-shaw
Fix CMake checks for Apple Clang 11.0 on macOS 10.15 (microsoft#8580)
1f39537 
* Fix CMake checks for Apple Clang 11.0 on macOS 10.15

* Use clang++ instance clang if allowAppleClang is enabled
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cbezault cbezault cbezault approved these changes

Assignees

@vicroms vicroms

@dan-shaw dan-shaw

Labels
category:vcpkg-bug The issue is with the vcpkg system (including helper scripts in `scripts/cmake/`)
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@joelpelaez @cenit @cbezault @dan-shaw @vicroms