commit c319d8ae3b7522656f74085281672f61c7112a98 · pyrox.dev/nixpkgs

+25
pkgs/build-support/cc-wrapper/cc-wrapper.sh
···

       122
       122
        
       

     

       123
       123
        
       if [[ "$isCxx" = 1 ]]; then

     

       124
       124
        
           if [[ "$cxxInclude" = 1 ]]; then

     

       125
       125
       +
               #

     

       126
       126
       +
               # The motivation for this comment is to explain the reason for appending

     

       127
       127
       +
               # the C++ stdlib to NIX_CFLAGS_COMPILE, which I initially thought should

     

       128
       128
       +
               # change and later realized it shouldn't in:

     

       129
       129
       +
               #

     

       130
       130
       +
               #   https://github.com/NixOS/nixpkgs/pull/185569#issuecomment-1234959249

     

       131
       131
       +
               #

     

       132
       132
       +
               # NIX_CFLAGS_COMPILE contains dependencies added using "-isystem", and

     

       133
       133
       +
               # NIX_CXXSTDLIB_COMPILE adds the C++ stdlib using "-isystem". Appending

     

       134
       134
       +
               # NIX_CXXSTDLIB_COMPILE to NIX_CLAGS_COMPILE emulates this part of the

     

       135
       135
       +
               # include lookup order from GCC/Clang:

     

       136
       136
       +
               #

     

       137
       137
       +
               # > 4. Directories specified with -isystem options are scanned in

     

       138
       138
       +
               # >    left-to-right order.

     

       139
       139
       +
               # > 5. Standard system directories are scanned.

     

       140
       140
       +
               # > 6. Directories specified with -idirafter options are scanned

     

       141
       141
       +
               # >    in left-to-right order.

     

       142
       142
       +
               #

     

       143
       143
       +
               # NIX_CXX_STDLIB_COMPILE acts as the "standard system directories" that

     

       144
       144
       +
               # are otherwise missing from CC in nixpkgs, so should be added last.

     

       145
       145
       +
               #

     

       146
       146
       +
               # This means that the C standard library should never be present inside

     

       147
       147
       +
               # NIX_CFLAGS_COMPILE, because it MUST come after the C++ stdlib. It is

     

       148
       148
       +
               # added automatically by cc-wrapper later using "-idirafter".

     

       149
       149
       +
               #

     

       125
       150
        
               NIX_CFLAGS_COMPILE_@suffixSalt@+=" $NIX_CXXSTDLIB_COMPILE_@suffixSalt@"

     

       126
       151
        
           fi

     

       127
       152
        
           if [[ "$cxxLibrary" = 1 ]]; then