Unverified Commit fdc9beee authored by Alyssa Ross's avatar Alyssa Ross Committed by GitHub
Browse files

Improve clang-tools wrapper (#484705)

parents afddaa60 0273d9ce

pkgs/development/compilers/llvm/common/clang-tools/wrapper

+23 −5
Original line number Diff line number Diff line 
#!/bin/sh



buildcpath() {

  local path after

  while (( $# )); do

    case $1 in

        -isystem)

            shift

            path=$path${path:+':'}$1

            ;;

        -idirafter)

            shift

            after=$after${after:+':'}$1

            ;;

    esac

    shift

  done

  echo $path${after:+':'}$after

}



buildcpluspath() {

  local path after

  while (( $# )); do

    case $1 in
@@ -29,10 +47,10 @@ for arg in "$@"; do 
done



if [ "$extendcpath" = true ]; then

  export CPATH=${CPATH}${CPATH:+':'}$(buildcpath ${NIX_CFLAGS_COMPILE} \

  export C_INCLUDE_PATH=${CPATH}${CPATH:+':'}$(buildcpath ${NIX_CFLAGS_COMPILE} \

                                                          $(<@clang@/nix-support/libc-cflags))



  export CPLUS_INCLUDE_PATH=${CPLUS_INCLUDE_PATH}${CPLUS_INCLUDE_PATH:+':'}$(buildcpath ${NIX_CFLAGS_COMPILE} \

  export CPLUS_INCLUDE_PATH=${CPLUS_INCLUDE_PATH}${CPLUS_INCLUDE_PATH:+':'}$(buildcpluspath ${NIX_CFLAGS_COMPILE} \

                                                                                            $(<@clang@/nix-support/libcxx-cxxflags) \

                                                                                            $(<@clang@/nix-support/libc-cflags))

fi