s

Author: firewave

selfcheck.sh

@@ -21,13 +21,12 @@ fi
 # TODO: how to get built-in include paths from compiler?
 if [ "$cxx_type" = "g++" ]; then
   gcc_ver=$($CXX -dumpversion)
-  find /usr/include -name stddef.h
-  find /usr/lib -name stddef.h
   defs=
   defs="$defs -D__GNUC__"
   defs="$defs -D__STDC__"
   defs="$defs -D__STDC_HOSTED__"
   defs="$defs -D__CHAR_BIT__=8"
+  defs="$defs -D__x86_64__"
   defs="$defs -D__has_builtin(x)=(1)"
   defs="$defs -D__has_cpp_attribute(x)=(1)"
   defs="$defs -D__has_attribute(x)=(1)"
@@ -36,12 +35,15 @@ if [ "$cxx_type" = "g++" ]; then
   inc="$inc -I/usr/include"
   inc="$inc -I/usr/include/linux"
   inc="$inc -I/usr/include/c++/$gcc_ver"
-  if [ -d /usr/include/c++/$gcc_ver/x86_64-pc-linux-gnu ]; then
+  if [ -d "/usr/include/c++/$gcc_ver/x86_64-pc-linux-gnu" ]; then
     inc="$inc -I/usr/include/c++/$gcc_ver/x86_64-pc-linux-gnu"
   fi
-  if [ -d /usr/lib/gcc/x86_64-pc-linux-gnu/$gcc_ver/include ]; then
+  if [ -d "/usr/lib/gcc/x86_64-pc-linux-gnu/$gcc_ver/include" ]; then
     inc="$inc -I/usr/lib/gcc/x86_64-pc-linux-gnu/$gcc_ver/include"
   fi
+  if [ -d "/usr/lib/gcc/x86_64-linux-gnu/$gcc_ver/include" ]; then
+    inc="$inc -I/usr/lib/gcc/x86_64-linux-gnu/$gcc_ver/include"
+  fi
   if [ -d "/usr/include/x86_64-linux-gnu" ]; then
     inc="$inc -I/usr/include/x86_64-linux-gnu"
     inc="$inc -I/usr/include/x86_64-linux-gnu/c++/$gcc_ver"