s

Author: firewave

selfcheck.sh

@@ -28,8 +28,7 @@ if [ "$cxx_type" = "g++" ]; then
 elif [ "$cxx_type" = "clang" ]; then
   clang_ver=$($CXX -dumpversion)
   clang_ver=${clang_ver%%.*}
-  find /usr/include -name features.h
-  find /usr/include -name endian.h
+  find /usr/include -name bits/wordsize.h
   cxx_inc="/usr/include/c++/v1"
   if [ ! -d "$cxx_inc" ]; then
     cxx_inc="/usr/lib/llvm-$clang_ver/include/c++/v1"
@@ -40,11 +39,12 @@ elif [ "$cxx_type" = "clang" ]; then
     exit $ec
   fi
 elif [ "$cxx_type" = "Apple" ]; then
-  #clang_ver=$($CXX -dumpversion)
-  #clang_ver=${clang_ver%%.*}
   find /Applications -name cctype
-  # 16.1 is a Xcode version common to all used platforms
-  ./simplecpp simplecpp.cpp -e -f -std=gnu++11 -D__BYTE_ORDER__ -D__APPLE__ -I"/Applications/Xcode_16.1.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include" -I"/Applications/Xcode_16.1.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/c++/v1"
+  xcode_path="/Applications/Xcode_16.4.app"
+  if [ ! -d "$xcode_path" ]; then
+    xcode_path="/Applications/Xcode_16.1.app"
+  fi
+  ./simplecpp simplecpp.cpp -e -f -std=gnu++11 -D__BYTE_ORDER__ -D__APPLE__ -I"$xcode_path/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include" -I"$xcode_path/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/c++/v1"
   ec=$?
   if [ $ec -ne 0 ]; then
     exit $ec