From 5258390fd5cd3c04bf43f0e34dd40bc8c5f84354 Mon Sep 17 00:00:00 2001
From: Muhammad Herdiansyah <herdiansyah@netc.eu>
Date: Wed, 19 Feb 2020 08:09:19 +0700
Subject: [PATCH] libunwind: also build with C++ compiler on musl

Clang-9 (the C compiler) errors out and refuses to build anything
if -stdlib=c++11 is set. This ensures that libunwind will be built
with the C++ compiler just like on glibc.
---
 src/libunwind/build.rs | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/libunwind/build.rs b/src/libunwind/build.rs
index a24808b32506f..9f3f5149b8d50 100644
--- a/src/libunwind/build.rs
+++ b/src/libunwind/build.rs
@@ -106,9 +106,6 @@ mod llvm_libunwind {
         }
 
         if target_env == "musl" {
-            // use the same C compiler command to compile C++ code so we do not need to setup the
-            // C++ compiler env variables on the builders
-            cfg.cpp(false);
             // linking for musl is handled in lib.rs
             cfg.cargo_metadata(false);
             println!("cargo:rustc-link-search=native={}", env::var("OUT_DIR").unwrap());