s

Author: firewave

selfcheck.sh

@@ -56,7 +56,6 @@ if [ "$cxx_type" = "g++" ]; then
 elif [ "$cxx_type" = "clang" ]; then
   clang_ver=$($CXX -dumpversion)
   clang_ver=${clang_ver%%.*}
-  find /usr/include -name cctype
   defs=
   defs="$defs -D__BYTE_ORDER__"
   defs="$defs -D__linux__"
@@ -72,7 +71,8 @@ elif [ "$cxx_type" = "clang" ]; then
   inc=
   if [ -d "/usr/include/c++/v1" ]; then
     inc="$inc -I/usr/include/c++/v1"
-  elif [ -d "/usr/include/c++/$clang_ver" ]; then
+  fi
+  if [ -d "/usr/include/c++/$clang_ver" ]; then
     inc="$inc -I/usr/include/c++/$clang_ver"
   fi
   inc="$inc -I/usr/include"
@@ -86,12 +86,18 @@ elif [ "$cxx_type" = "clang" ]; then
     exit $ec
   fi
 elif [ "$cxx_type" = "Apple" ]; then
-  find /Applications -name endian.h
   xcode_path="/Applications/Xcode_16.4.app"
   if [ ! -d "$xcode_path" ]; then
     xcode_path="/Applications/Xcode_15.2.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"
+  find $xcode_path -name endian.h
+  defs=
+  defs="$defs -D__BYTE_ORDER__"
+  defs="$defs -D__APPLE__"
+  inc=
+  inc="$inc -I$xcode_path/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include"
+  inc="$inc -I$xcode_path/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/c++/v1"
+  ./simplecpp simplecpp.cpp -e -f -std=gnu++11 $defs $inc
   ec=$?
   if [ $ec -ne 0 ]; then
     exit $ec