tangled
alpha
login
or
join now
pyrox.dev
/
nixpkgs
lol
0
fork
atom
overview
issues
pulls
pipelines
rename occurrences of gcc.gcc to gcc.cc
Eric Seidel
11 years ago
88eae464
f3c68273
+38
-38
17 changed files
expand all
collapse all
unified
split
nixos
modules
services
networking
dnscrypt-proxy.nix
system
boot
stage-1.nix
pkgs
applications
misc
xca
default.nix
networking
copy-com
default.nix
dropbox
default.nix
ike
default.nix
science
math
mathematica
9.nix
default.nix
desktops
kde-4.14
kdesdk
kde-dev-utils.nix
development
compilers
ghcjs
default.nix
tools
misc
ccache
default.nix
distcc
default.nix
selenium
server
default.nix
stdenv
linux
default.nix
make-bootstrap-tools-crosspi.nix
make-bootstrap-tools.nix
top-level
all-packages.nix
+1
-1
nixos/modules/services/networking/dnscrypt-proxy.nix
···
103
103
${pkgs.tzdata}/share/zoneinfo/** r,
104
104
105
105
${dnscrypt-proxy}/share/dnscrypt-proxy/** r,
106
106
-
${pkgs.gcc.gcc}/lib/libssp.so.* mr,
106
106
+
${pkgs.gcc.cc}/lib/libssp.so.* mr,
107
107
${pkgs.libsodium}/lib/libsodium.so.* mr,
108
108
}
109
109
'')
+1
-1
nixos/modules/system/boot/stage-1.nix
···
46
46
cp -pv ${pkgs.glibc}/lib/libpthread.so.* $out/lib
47
47
cp -pv ${pkgs.glibc}/lib/librt.so.* $out/lib
48
48
cp -pv ${pkgs.glibc}/lib/libdl.so.* $out/lib
49
49
-
cp -pv ${pkgs.gcc.gcc}/lib*/libgcc_s.so.* $out/lib
49
49
+
cp -pv ${pkgs.gcc.cc}/lib*/libgcc_s.so.* $out/lib
50
50
51
51
# Copy BusyBox.
52
52
cp -pvd ${pkgs.busybox}/bin/* ${pkgs.busybox}/sbin/* $out/bin/
+1
-1
pkgs/applications/misc/xca/default.nix
···
17
17
18
18
postInstall = ''
19
19
wrapProgram "$out/bin/xca" \
20
20
-
--prefix LD_LIBRARY_PATH : "${qt4}/lib:${gcc.gcc}/lib:${gcc.gcc}/lib64:${openssl}/lib:${libtool}/lib"
20
20
+
--prefix LD_LIBRARY_PATH : "${qt4}/lib:${gcc.cc}/lib:${gcc.cc}/lib64:${openssl}/lib:${libtool}/lib"
21
21
'';
22
22
23
23
buildInputs = [ openssl qt4 libtool gcc makeWrapper ];
+1
-1
pkgs/applications/networking/copy-com/default.nix
···
37
37
patchelf --set-interpreter ${stdenv.glibc}/lib/${interpreter} \
38
38
"$out/${appdir}/CopyConsole"
39
39
40
40
-
RPATH=${gcc.gcc}/lib:$out/${appdir}
40
40
+
RPATH=${gcc.cc}/lib:$out/${appdir}
41
41
echo "updating rpaths to: $RPATH"
42
42
find "$out/${appdir}" -type f -a -perm +0100 \
43
43
-print -exec patchelf --force-rpath --set-rpath "$RPATH" {} \;
+1
-1
pkgs/applications/networking/dropbox/default.nix
···
76
76
patchelf --set-interpreter ${stdenv.glibc}/lib/${interpreter} \
77
77
"$out/${appdir}/dropbox"
78
78
79
79
-
RPATH=${ldpath}:${gcc.gcc}/lib:$out/${appdir}
79
79
+
RPATH=${ldpath}:${gcc.cc}/lib:$out/${appdir}
80
80
echo "updating rpaths to: $RPATH"
81
81
find "$out/${appdir}" -type f -a -perm +0100 \
82
82
-print -exec patchelf --force-rpath --set-rpath "$RPATH" {} \;
+1
-1
pkgs/applications/networking/ike/default.nix
···
33
33
installPhase = ''
34
34
make install
35
35
for file in "$out"/bin/* "$out"/sbin/*; do
36
36
-
wrapProgram $file --prefix LD_LIBRARY_PATH ":" "$out/lib:${openssl}/lib:${gcc.gcc}/lib:${stdenv.glibc}/lib::${gcc.gcc}/lib64:${stdenv.glibc}/lib64:${libedit}/lib:${qt4}/lib"
36
36
+
wrapProgram $file --prefix LD_LIBRARY_PATH ":" "$out/lib:${openssl}/lib:${gcc.cc}/lib:${stdenv.glibc}/lib::${gcc.cc}/lib64:${stdenv.glibc}/lib64:${libedit}/lib:${qt4}/lib"
37
37
done
38
38
'';
39
39
+1
-1
pkgs/applications/science/math/mathematica/9.nix
···
44
44
coreutils
45
45
fontconfig
46
46
freetype
47
47
-
gcc.gcc
47
47
+
gcc.cc
48
48
gcc.libc
49
49
glib
50
50
ncurses
+1
-1
pkgs/applications/science/math/mathematica/default.nix
···
47
47
coreutils
48
48
fontconfig
49
49
freetype
50
50
-
gcc.gcc
50
50
+
gcc.cc
51
51
gcc.libc
52
52
glib
53
53
ncurses
+1
-1
pkgs/desktops/kde-4.14/kdesdk/kde-dev-utils.nix
···
3
3
kde {
4
4
buildInputs = [ kdelibs libtool ];
5
5
6
6
-
preConfigure = "export CMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH:${gcc}:${gcc.gcc}";
6
6
+
preConfigure = "export CMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH:${gcc}:${gcc.cc}";
7
7
8
8
meta = {
9
9
description = "various KDE development utilities";
+1
-1
pkgs/development/compilers/ghcjs/default.nix
···
71
71
chmod -R u+w $topDir/shims
72
72
'';
73
73
postInstall = ''
74
74
-
PATH=$out/bin:${Cabal}/bin:$PATH LD_LIBRARY_PATH=${gmp}/lib:${gcc.gcc}/lib64:$LD_LIBRARY_PATH \
74
74
+
PATH=$out/bin:${Cabal}/bin:$PATH LD_LIBRARY_PATH=${gmp}/lib:${gcc.cc}/lib64:$LD_LIBRARY_PATH \
75
75
env -u GHC_PACKAGE_PATH $out/bin/ghcjs-boot \
76
76
--dev \
77
77
--with-cabal ${cabalInstall}/bin/cabal \
+4
-4
pkgs/development/tools/misc/ccache/default.nix
···
17
17
links = extraConfig : (runCommand "ccache-links" { }
18
18
''
19
19
mkdir -p $out/bin
20
20
-
if [ -x "${gcc.gcc}/bin/gcc" ]; then
20
20
+
if [ -x "${gcc.cc}/bin/gcc" ]; then
21
21
cat > $out/bin/gcc << EOF
22
22
#!/bin/sh
23
23
${extraConfig}
24
24
-
exec ${ccache}/bin/ccache ${gcc.gcc}/bin/gcc "\$@"
24
24
+
exec ${ccache}/bin/ccache ${gcc.cc}/bin/gcc "\$@"
25
25
EOF
26
26
chmod +x $out/bin/gcc
27
27
fi
28
28
-
if [ -x "${gcc.gcc}/bin/g++" ]; then
28
28
+
if [ -x "${gcc.cc}/bin/g++" ]; then
29
29
cat > $out/bin/g++ << EOF
30
30
#!/bin/sh
31
31
${extraConfig}
32
32
-
exec ${ccache}/bin/ccache ${gcc.gcc}/bin/g++ "\$@"
32
32
+
exec ${ccache}/bin/ccache ${gcc.cc}/bin/g++ "\$@"
33
33
EOF
34
34
chmod +x $out/bin/g++
35
35
fi
+2
-2
pkgs/development/tools/misc/distcc/default.nix
···
44
44
links = extraConfig : (runCommand "distcc-links" { }
45
45
''
46
46
mkdir -p $out/bin
47
47
-
if [ -x "${gcc.gcc}/bin/gcc" ]; then
47
47
+
if [ -x "${gcc.cc}/bin/gcc" ]; then
48
48
cat > $out/bin/gcc << EOF
49
49
#!/bin/sh
50
50
${extraConfig}
···
52
52
EOF
53
53
chmod +x $out/bin/gcc
54
54
fi
55
55
-
if [ -x "${gcc.gcc}/bin/g++" ]; then
55
55
+
if [ -x "${gcc.cc}/bin/g++" ]; then
56
56
cat > $out/bin/g++ << EOF
57
57
#!/bin/sh
58
58
${extraConfig}
+1
-1
pkgs/development/tools/selenium/server/default.nix
···
29
29
${jdk}/bin/jar xf $src launchers/launcher-linux-amd64
30
30
patchelf \
31
31
--set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
32
32
-
--set-rpath "${gcc.gcc}/lib/:${gcc.gcc}/lib64:${xlibs.libX11}/lib" \
32
32
+
--set-rpath "${gcc.cc}/lib/:${gcc.cc}/lib64:${xlibs.libX11}/lib" \
33
33
launchers/launcher-linux-${arch}
34
34
${jdk}/bin/jar uf $src launchers/launcher-linux-${arch}
35
35
'';
+1
-1
pkgs/stdenv/linux/default.nix
···
283
283
allowedRequisites = with stage4.pkgs;
284
284
[ gzip bzip2 xz bash binutils coreutils diffutils findutils gawk
285
285
glibc gnumake gnused gnutar gnugrep gnupatch patchelf attr acl
286
286
-
paxctl zlib pcre linuxHeaders ed gcc gcc.gcc libsigsegv
286
286
+
paxctl zlib pcre linuxHeaders ed gcc gcc.cc libsigsegv
287
287
];
288
288
289
289
overrides = pkgs: {
+8
-8
pkgs/stdenv/linux/make-bootstrap-tools-crosspi.nix
···
162
162
cp -d ${gnugrep.pcre.crossDrv}/lib/libpcre*.so* $out/lib # needed by grep
163
163
164
164
# Copy what we need of GCC.
165
165
-
cp -d ${gcc.gcc.crossDrv}/bin/gcc $out/bin
166
166
-
cp -d ${gcc.gcc.crossDrv}/bin/cpp $out/bin
167
167
-
cp -d ${gcc.gcc.crossDrv}/bin/g++ $out/bin
168
168
-
cp -d ${gcc.gcc.crossDrv}/lib*/libgcc_s.so* $out/lib
169
169
-
cp -d ${gcc.gcc.crossDrv}/lib*/libstdc++.so* $out/lib
170
170
-
cp -rd ${gcc.gcc.crossDrv}/lib/gcc $out/lib
165
165
+
cp -d ${gcc.cc.crossDrv}/bin/gcc $out/bin
166
166
+
cp -d ${gcc.cc.crossDrv}/bin/cpp $out/bin
167
167
+
cp -d ${gcc.cc.crossDrv}/bin/g++ $out/bin
168
168
+
cp -d ${gcc.cc.crossDrv}/lib*/libgcc_s.so* $out/lib
169
169
+
cp -d ${gcc.cc.crossDrv}/lib*/libstdc++.so* $out/lib
170
170
+
cp -rd ${gcc.cc.crossDrv}/lib/gcc $out/lib
171
171
chmod -R u+w $out/lib
172
172
rm -f $out/lib/gcc/*/*/include*/linux
173
173
rm -f $out/lib/gcc/*/*/include*/sound
···
175
175
rm -f $out/lib/gcc/*/*/include-fixed/asm
176
176
rm -rf $out/lib/gcc/*/*/plugin
177
177
#rm -f $out/lib/gcc/*/*/*.a
178
178
-
cp -rd ${gcc.gcc.crossDrv}/libexec/* $out/libexec
178
178
+
cp -rd ${gcc.cc.crossDrv}/libexec/* $out/libexec
179
179
mkdir $out/include
180
180
-
cp -rd ${gcc.gcc.crossDrv}/include/c++ $out/include
180
180
+
cp -rd ${gcc.cc.crossDrv}/include/c++ $out/include
181
181
chmod -R u+w $out/include
182
182
rm -rf $out/include/c++/*/ext/pb_ds
183
183
rm -rf $out/include/c++/*/ext/parallel
+8
-8
pkgs/stdenv/linux/make-bootstrap-tools.nix
···
89
89
cp -d ${gnugrep.pcre}/lib/libpcre*.so* $out/lib # needed by grep
90
90
91
91
# Copy what we need of GCC.
92
92
-
cp -d ${gcc.gcc}/bin/gcc $out/bin
93
93
-
cp -d ${gcc.gcc}/bin/cpp $out/bin
94
94
-
cp -d ${gcc.gcc}/bin/g++ $out/bin
95
95
-
cp -d ${gcc.gcc}/lib*/libgcc_s.so* $out/lib
96
96
-
cp -d ${gcc.gcc}/lib*/libstdc++.so* $out/lib
97
97
-
cp -rd ${gcc.gcc}/lib/gcc $out/lib
92
92
+
cp -d ${gcc.cc}/bin/gcc $out/bin
93
93
+
cp -d ${gcc.cc}/bin/cpp $out/bin
94
94
+
cp -d ${gcc.cc}/bin/g++ $out/bin
95
95
+
cp -d ${gcc.cc}/lib*/libgcc_s.so* $out/lib
96
96
+
cp -d ${gcc.cc}/lib*/libstdc++.so* $out/lib
97
97
+
cp -rd ${gcc.cc}/lib/gcc $out/lib
98
98
chmod -R u+w $out/lib
99
99
rm -f $out/lib/gcc/*/*/include*/linux
100
100
rm -f $out/lib/gcc/*/*/include*/sound
···
102
102
rm -f $out/lib/gcc/*/*/include-fixed/asm
103
103
rm -rf $out/lib/gcc/*/*/plugin
104
104
#rm -f $out/lib/gcc/*/*/*.a
105
105
-
cp -rd ${gcc.gcc}/libexec/* $out/libexec
105
105
+
cp -rd ${gcc.cc}/libexec/* $out/libexec
106
106
chmod -R u+w $out/libexec
107
107
rm -rf $out/libexec/gcc/*/*/plugin
108
108
mkdir $out/include
109
109
-
cp -rd ${gcc.gcc}/include/c++ $out/include
109
109
+
cp -rd ${gcc.cc}/include/c++ $out/include
110
110
chmod -R u+w $out/include
111
111
rm -rf $out/include/c++/*/ext/pb_ds
112
112
rm -rf $out/include/c++/*/ext/parallel
+4
-4
pkgs/top-level/all-packages.nix
···
3248
3248
3249
3249
gcc48_multi =
3250
3250
if system == "x86_64-linux" then lowPrio (
3251
3251
-
wrapCCWith (import ../build-support/cc-wrapper) glibc_multi (gcc48.gcc.override {
3252
3252
-
stdenv = overrideCC stdenv (wrapCCWith (import ../build-support/cc-wrapper) glibc_multi gcc.gcc);
3251
3251
+
wrapCCWith (import ../build-support/cc-wrapper) glibc_multi (gcc48.cc.override {
3252
3252
+
stdenv = overrideCC stdenv (wrapCCWith (import ../build-support/cc-wrapper) glibc_multi gcc.cc);
3253
3253
profiledCompiler = false;
3254
3254
enableMultilib = true;
3255
3255
}))
···
4613
4613
distccMasquerade = if stdenv.isDarwin
4614
4614
then null
4615
4615
else callPackage ../development/tools/misc/distcc/masq.nix {
4616
4616
-
gccRaw = gcc.gcc;
4616
4616
+
gccRaw = gcc.cc;
4617
4617
binutils = binutils;
4618
4618
};
4619
4619
···
13163
13163
# this is to circumvent the bug with libgcc_s.so.1 which is
13164
13164
# not found when using thread
13165
13165
extraCmds = ''
13166
13166
-
LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:${gcc.gcc}/lib
13166
13166
+
LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:${gcc.cc}/lib
13167
13167
export LD_LIBRARY_PATH
13168
13168
'';
13169
13169
};