diff --git a/x11/library/mesa/actions.py b/x11/library/mesa/actions.py
index b42f467aa0..628cc3370f 100644
--- a/x11/library/mesa/actions.py
+++ b/x11/library/mesa/actions.py
@@ -50,7 +50,7 @@ def setup():
         shelltools.export("CC", "clang -m32")
         shelltools.export("CXX", "clang++ -m32")
         pisitools.cflags.add("-m32 ")
-        pisitools.cxxflags.add("-m32 -stdlib=libc++")
+        pisitools.cxxflags.add("-m32")
         #shelltools.export("CC", "gcc -m32")
         #shelltools.export("CXX", "g++ -m32")
         shelltools.export("PKG_CONFIG_PATH","/usr/lib32/pkgconfig")
@@ -59,7 +59,7 @@ def setup():
         shelltools.export("CC", "clang")
         shelltools.export("CXX", "clang++")
         pisitools.cflags.add("-m64 ")
-        pisitools.cxxflags.add("-m64 -stdlib=libc++")
+        pisitools.cxxflags.add("-m64")
         options += " -Dgallium-omx=bellagio -Dlmsensors=enabled -Dzstd=enabled"
     
     #pisitools.ldflags.add("-fuse-ld=lld")
diff --git a/x11/library/mesa/pspec.xml b/x11/library/mesa/pspec.xml
index adcfcc4498..7044094eeb 100644
--- a/x11/library/mesa/pspec.xml
+++ b/x11/library/mesa/pspec.xml
@@ -58,7 +58,7 @@
             <Dependency>libglvnd-devel</Dependency>
             <Dependency>libclc-devel</Dependency>
             <Dependency>vulkan-devel</Dependency>
-            <Dependency>libcxx-devel</Dependency>
+<!--             <Dependency>libcxx-devel</Dependency> -->
             <Dependency>lm_sensors-devel</Dependency>
         </BuildDependencies>
         <AdditionalFiles>