Use system iwyu and reference libraries

etr · web-flow · commit 2cd6296eca07 · 2021-02-28T14:05:51.000-08:00
diff --git a/.github/workflows/verify-build.yml b/.github/workflows/verify-build.yml
@@ -196,8 +196,8 @@ jobs:
             os: ubuntu-latest
             build-type: iwyu
             compiler-family: clang
-            c-compiler: clang-9
-            cc-compiler: clang-9++
+            c-compiler: clang-7
+            cc-compiler: clang-7++
             debug: nodebug
             coverage: nocoverage
     steps:
@@ -236,24 +236,24 @@ jobs:
 
     - name: Install IWYU dependencies if needed
       run: |
-        sudo apt-get install cmake llvm-9-dev llvm-9-tools libclang-9-dev clang-9
+        sudo apt-get install cmake llvm-7-dev llvm-7-tools libclang-7-dev clang-7 iwyu
       if: ${{ matrix.build-type == 'iwyu' }}
 
     # Installing iwyu manually because clang and iwyu paths won't match on Ubuntu otherwise.
-    - name: Install IWYU if requested
-      run: |
-        CLANG_ROOT_PATH=`llvm-config-9 --prefix` ;
-        CLANG_BIN_PATH=`llvm-config-9 --bindir` ;
-        curl "https://libhttpserver.s3.amazonaws.com/travis_stuff/include-what-you-use-clang-9.tgz" -o "include-what-you-use-clang-9.tgz" ;
-        tar -xzf "include-what-you-use-clang-9.tgz" ;
-        cd include-what-you-use ;
-        mkdir build_iwyu ;
-        cd build_iwyu ;
-        cmake -G "Unix Makefiles" -DCMAKE_CXX_FLAGS=-std=gnu++14 -DCMAKE_PREFIX_PATH=$ROOT_PATH -DCMAKE_C_COMPILER=$CLANG_BIN_PATH/clang -DCMAKE_CXX_COMPILER=$CLANG_BIN_PATH/clang++ ../ ;
-        make ;
-        sudo make install ;
-        cd .. ;
-      if: ${{ matrix.build-type == 'iwyu' }}
+    # - name: Install IWYU if requested
+    #  run: |
+    #    CLANG_ROOT_PATH=`llvm-config-9 --prefix` ;
+    #    CLANG_BIN_PATH=`llvm-config-9 --bindir` ;
+    #    curl "https://libhttpserver.s3.amazonaws.com/travis_stuff/include-what-you-use-clang-9.tgz" -o "include-what-you-use-clang-9.tgz" ;
+    #    tar -xzf "include-what-you-use-clang-9.tgz" ;
+    #    cd include-what-you-use ;
+    #    mkdir build_iwyu ;
+    #    cd build_iwyu ;
+    #    cmake -G "Unix Makefiles" -DCMAKE_CXX_FLAGS=-std=gnu++14 -DCMAKE_PREFIX_PATH=$ROOT_PATH -DCMAKE_C_COMPILER=$CLANG_BIN_PATH/clang -DCMAKE_CXX_COMPILER=$CLANG_BIN_PATH/clang++ ../ ;
+    #    make ;
+    #    sudo make install ;
+    #    cd .. ;
+    #  if: ${{ matrix.build-type == 'iwyu' }}
 
     - name: CURL from cache (for testing)
       id: cache-CURL
@@ -351,9 +351,11 @@ jobs:
       run: |
         cd build ;
         if [ "$BUILD_TYPE" = "iwyu" ]; then
-          clang-9 -print-resource-dir ;
-          /usr/local/bin/include-what-you-use -print-resource-dir ;
-          make -k CXX='/usr/local/bin/include-what-you-use -Xiwyu --mapping_file=${top_builddir}/../custom_iwyu.imp' CXXFLAGS="-std=c++11 -DHTTPSERVER_COMPILATION -D_REENTRANT $CXXFLAGS" ;
+          clang-7 -print-resource-dir ;
+          /usr/bin/include-what-you-use -print-resource-dir ;
+          sudo ln -s `clang-7 -print-resource dir`/include `/usr/bin/include-what-you-use -print-resource-dir`/include ;
+          sudo ln -s `clang-7 -print-resource dir`/lib `/usr/bin/include-what-you-use -print-resource-dir`/lib ;
+          make -k CXX='/usr/bin/include-what-you-use -Xiwyu --mapping_file=${top_builddir}/../custom_iwyu.imp' CXXFLAGS="-std=c++11 -DHTTPSERVER_COMPILATION -D_REENTRANT $CXXFLAGS" ;
           if [ $? -ne 2 ]; then 
             return 1;
           fi
