s

Author: firewave

selfcheck.sh

@@ -46,6 +46,7 @@ elif [ "$cxx_type" = "clang" ]; then
   defs="$defs -D__has_feature(x)=(1)"
   defs="$defs -D__has_include_next(x)=(0)"
   defs="$defs -D__has_attribute(x)=(0)"
+  defs="$defs -D__building_module(x)=(0)"
 
   inc=
   while read line
@@ -69,13 +70,6 @@ elif [ "$cxx_type" = "clang" ]; then
   #  inc="$inc -I$line"
   #done <<< "$($CXX -x c++ -stdlib=libc++ -v -c -S - 2>&1 < /dev/null | grep -e'^ [/A-Z]')"
 elif [ "$cxx_type" = "Apple" ]; then
-  appleclang_ver=$($CXX -dumpversion)
-  appleclang_ver=${appleclang_ver%%.*}
-  xcode_path="/Applications/Xcode_16.4.app"
-  if [ ! -d "$xcode_path" ]; then
-    xcode_path="/Applications/Xcode_15.2.app"
-  fi
-  sdk_path="$xcode_path/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk"
   defs=
   defs="$defs -D__BYTE_ORDER__"
   defs="$defs -D__APPLE__"
@@ -94,19 +88,12 @@ elif [ "$cxx_type" = "Apple" ]; then
   defs="$defs -D__is_target_environment(x)=(0)"
   defs="$defs -D__is_target_variant_os(x)=(0)"
   defs="$defs -D__is_target_variant_environment(x)=(0)"
+
   inc=
   while read line
   do
     inc="$inc -I$line"
-  done <<< "$($CXX -x c++ -v -c -S - 2>&1 < /dev/null | grep -e'^ [/A-Z]')"
-  echo $inc
-  inc=
-  inc="$inc -I$sdk_path/usr/include/c++/v1"
-  inc="$inc -I$sdk_path/usr/include"
-  inc="$inc -I$sdk_path/usr/include/i386"
-  if [ -d "$xcode_path/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/clang/$appleclang_ver/include" ]; then
-    inc="$inc -I$xcode_path/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/clang/$appleclang_ver/include"
-  fi
+  done <<< "$($CXX -x c++ -v -c -S - 2>&1 < /dev/null | grep -e'^ [/A-Z]' | grep -v '(framework directory)')"
 else
   echo "unknown compiler '$cxx_type'"
   exit 1