···

       
62
       
62
       
 
       
        )

     

       
63
       
63
       
 
       


     

       
64
       
64
       
 
       
        if test "$names" = "glibc"; then names="stdenv.glibc"; fi

     

       
65
       
65
       
-
       
        if echo $names | grep -c "gcc" &> /dev/null; then names="stdenv.cc.gcc"; fi

     

       
65
       
65
       
+
       
        if echo $names | grep -c "gcc" &> /dev/null; then names="stdenv.cc.cc"; fi

     

       
66
       
66
       
 
       


     

       
67
       
67
       
 
       
        if test $lib != $libPath; then

     

       
68
       
68
       
 
       
            interpreter="--interpreter \${$names}/lib/$lib"

     

···

       
165
       
165
       
 
       
    cp -rsf ${staticUsrProfileTarget}/lib64/* lib64/

     

       
166
       
166
       
 
       


     

       
167
       
167
       
 
       
    # copy gcc libs (and may overwrite exitsting wrongly placed libs)

     

       
168
       
168
       
-
       
    cp -rsf ${choosenGcc.gcc}/lib/*   lib/

     

       
169
       
169
       
-
       
    cp -rsf ${choosenGcc.gcc}/lib64/* lib64/

     

       
168
       
168
       
+
       
    cp -rsf ${choosenGcc.cc}/lib/*   lib/

     

       
169
       
169
       
+
       
    cp -rsf ${choosenGcc.cc}/lib64/* lib64/

     

       
170
       
170
       
 
       
  '';

     

       
171
       
171
       
 
       


     

       
172
       
172
       
 
       
in stdenv.mkDerivation {

     

···

       
35
       
35
       
 
       
      for i in emulator emulator-arm emulator-mips emulator-x86 mksdcard

     

       
36
       
36
       
 
       
      do

     

       
37
       
37
       
 
       
          patchelf --set-interpreter ${stdenv_32bit.cc.libc}/lib/ld-linux.so.2 $i

     

       
38
       
38
       
-
       
          patchelf --set-rpath ${stdenv_32bit.cc.gcc}/lib $i

     

       
38
       
38
       
+
       
          patchelf --set-rpath ${stdenv_32bit.cc.cc}/lib $i

     

       
39
       
39
       
 
       
      done

     

       
40
       
40
       
 
       
      

     

       
41
       
41
       
 
       
      ${stdenv.lib.optionalString (stdenv.system == "x86_64-linux") ''

     

···

       
31
       
31
       
 
       
        # These binaries need to find libstdc++ and libgcc_s

     

       
32
       
32
       
 
       
        for i in aidl libLLVM.so

     

       
33
       
33
       
 
       
        do

     

       
34
       
34
       
-
       
            patchelf --set-rpath ${stdenv_32bit.cc.gcc}/lib $i

     

       
34
       
34
       
+
       
            patchelf --set-rpath ${stdenv_32bit.cc.cc}/lib $i

     

       
35
       
35
       
 
       
        done

     

       
36
       
36
       
 
       
        

     

       
37
       
37
       
 
       
        # These binaries need to find libstdc++, libgcc_s and libraries in the current folder

     

       
38
       
38
       
 
       
        for i in libbcc.so libbcinfo.so libclang.so llvm-rs-cc

     

       
39
       
39
       
 
       
        do

     

       
40
       
40
       
-
       
            patchelf --set-rpath ${stdenv_32bit.cc.gcc}/lib:`pwd` $i

     

       
40
       
40
       
+
       
            patchelf --set-rpath ${stdenv_32bit.cc.cc}/lib:`pwd` $i

     

       
41
       
41
       
 
       
        done

     

       
42
       
42
       
 
       


     

       
43
       
43
       
 
       
        # These binaries also need zlib in addition to libstdc++

     

       
44
       
44
       
 
       
        for i in zipalign

     

       
45
       
45
       
 
       
        do

     

       
46
       
46
       
 
       
            patchelf --set-interpreter ${stdenv_32bit.cc.libc}/lib/ld-linux.so.2 $i

     

       
47
       
47
       
-
       
            patchelf --set-rpath ${stdenv_32bit.cc.gcc}/lib:${zlib_32bit}/lib $i

     

       
47
       
47
       
+
       
            patchelf --set-rpath ${stdenv_32bit.cc.cc}/lib:${zlib_32bit}/lib $i

     

       
48
       
48
       
 
       
        done

     

       
49
       
49
       
 
       
        

     

       
50
       
50
       
 
       
        # These binaries need to find libstdc++, libgcc_s, and zlib

     

       
51
       
51
       
 
       
        for i in aapt dexdump

     

       
52
       
52
       
 
       
        do

     

       
53
       
53
       
-
       
            patchelf --set-rpath ${stdenv_32bit.cc.gcc}/lib:${zlib_32bit}/lib $i

     

       
53
       
53
       
+
       
            patchelf --set-rpath ${stdenv_32bit.cc.cc}/lib:${zlib_32bit}/lib $i

     

       
54
       
54
       
 
       
        done

     

       
55
       
55
       
 
       
      ''}

     

       
56
       
56
       
 
       
      

     

···

       
29
       
29
       
 
       
        for i in adb fastboot

     

       
30
       
30
       
 
       
        do

     

       
31
       
31
       
 
       
            patchelf --set-interpreter ${stdenv_32bit.cc.libc}/lib/ld-linux.so.2 $i

     

       
32
       
32
       
-
       
            patchelf --set-rpath ${stdenv_32bit.cc.gcc}/lib $i

     

       
32
       
32
       
+
       
            patchelf --set-rpath ${stdenv_32bit.cc.cc}/lib $i

     

       
33
       
33
       
 
       
        done

     

       
34
       
34
       
 
       
    ''}

     

       
35
       
35
       
 
       
  '';