selfcheck.sh: also run with system includes made available

Author: firewave

.github/workflows/CI-unixish.yml

@@ -7,6 +7,7 @@ jobs:
 
     strategy:
       matrix:
+        # TODO: do not run g++ on macos-* as it is just an alias for clang++
         compiler: [clang++, g++]
         os: [ubuntu-22.04, ubuntu-24.04, macos-13, macos-14, macos-15]
       fail-fast: false
@@ -25,6 +26,12 @@ jobs:
           sudo apt-get update
           sudo apt-get install valgrind
 
+    - name: Install missing software on ubuntu (clang++)
+      if: matrix.os == 'ubuntu-22.04' && matrix.compiler == 'clang++'
+      run: |
+        sudo apt-get update
+        sudo apt-get install libc++-14-dev
+
     - name: Install missing software on ubuntu (clang++)
       if: matrix.os == 'ubuntu-24.04' && matrix.compiler == 'clang++'
       run: |

Makefile

@@ -16,7 +16,7 @@ test:	testrunner	simplecpp
 	python3 -m pytest integration_test.py -vv
 
 selfcheck:	simplecpp
-	./selfcheck.sh
+	CXX=$(CXX) ./selfcheck.sh
 
 simplecpp:	main.o simplecpp.o
 	$(CXX) $(LDFLAGS) main.o simplecpp.o -o simplecpp

selfcheck.sh

@@ -4,8 +4,45 @@ output=$(./simplecpp simplecpp.cpp -e -f 2>&1)
 ec=$?
 errors=$(echo "$output" | grep -v 'Header not found: <')
 if [ $ec -ne 0 ]; then
-  # only fail if got errors which do not refer to missing system includes
+  # only fail if we got errors which do not refer to missing system includes
   if [ ! -z "$errors" ]; then
     exit $ec
   fi
-fi
+fi
+
+if [ -z "$CXX" ]; then
+  exit 0
+fi
+
+cxx_type=$($CXX --version | head -1 | cut -d' ' -f1)
+if [ "$cxx_type" = "Ubuntu" ]; then
+  cxx_type=$($CXX --version | head -1 | cut -d' ' -f2)
+fi
+if [ "$cxx_type" = "g++" ]; then
+  gcc_ver=$($CXX -dumpversion)
+  ./simplecpp simplecpp.cpp -e -f -std=gnu++11 -D__GNUC__ -D__STDC__ -D__STDC_HOSTED__ -D__CHAR_BIT__=8 -I"/usr/include" -I"/usr/include/linux" -I"/usr/include/c++/$gcc_ver" -I"/usr/include/c++/$gcc_ver/x86_64-pc-linux-gnu" -I"/usr/lib64/gcc/x86_64-pc-linux-gnu/$gcc_ver/include" -I"/usr/include/x86_64-linux-gnu/c++/$gcc_ver"
+  ec=$?
+  if [ $ec -ne 0 ]; then
+    exit $ec
+  fi
+elif [ "$cxx_type" = "clang" ]; then
+  #clang_ver=$($CXX -dumpversion)
+  #clang_ver=${clang_ver%%.*}
+  ./simplecpp simplecpp.cpp -e -f -std=gnu++11 -D__BYTE_ORDER__ -I"/usr/include/c++/v1"
+  ec=$?
+  if [ $ec -ne 0 ]; then
+    exit $ec
+  fi
+elif [ "$cxx_type" = "Apple" ]; then
+  #clang_ver=$($CXX -dumpversion)
+  #clang_ver=${clang_ver%%.*}
+  # 16.1 is a Xcode version common to all used platforms
+  ./simplecpp simplecpp.cpp -e -f -std=gnu++11 -D__BYTE_ORDER__ -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"
+  ec=$?
+  if [ $ec -ne 0 ]; then
+    exit $ec
+  fi
+else
+  echo "unknown compiler '$cxx_type'"
+  exit 1
+fi