3
0
Fork 0
forked from mirrors/nixpkgs

rename <gcc-frontend>.gcc to <gcc-frontend>.cc

This commit is contained in:
Eric Seidel 2015-01-14 20:59:10 -08:00
parent b070eacfcd
commit f272730399
4 changed files with 5 additions and 5 deletions

View file

@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
# This should work on both x86_64, and i686 linux
preBuild = ''
export NIX_LDFLAGS="-L${gfortran.gcc}/lib64 -L${gfortran.gcc}/lib $NIX_LDFLAGS";
export NIX_LDFLAGS="-L${gfortran.cc}/lib64 -L${gfortran.cc}/lib $NIX_LDFLAGS";
'';
postInstall = ''

View file

@ -46,10 +46,10 @@ stdenv.mkDerivation rec {
mk install
mkdir -p $out/bin
makeWrapper $out/share/inferno/Linux/386/bin/emu $out/bin/emu \
--suffix LD_LIBRARY_PATH ':' "${gcc46.gcc}/lib" \
--suffix LD_LIBRARY_PATH ':' "${gcc46.cc}/lib" \
--suffix PATH ':' "$out/share/inferno/Linux/386/bin"
makeWrapper $infernoWrapper $out/bin/inferno \
--suffix LD_LIBRARY_PATH ':' "${gcc46.gcc}/lib" \
--suffix LD_LIBRARY_PATH ':' "${gcc46.cc}/lib" \
--suffix PATH ':' "$out/share/inferno/Linux/386/bin" \
--set INFERNO_ROOT "$out/share/inferno"
'';

View file

@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
CXX=$(type -p g++)
FC="${gfortran}/bin/gfortran" F77="${gfortran}/bin/gfortran"
JAVA_HOME="${jdk}"
LDFLAGS="-L${gfortran.gcc}/lib"
LDFLAGS="-L${gfortran.cc}/lib"
RANLIB=$(type -p ranlib)
R_SHELL="${stdenv.shell}"
)

View file

@ -15,7 +15,7 @@ stdenv.mkDerivation {
sed -e 's@/usr/bin/@@g' -i Makefile.*
NIX_ENFORCE_PURITY= \
make \
LIBGCJ="${gcj.gcc}/share/java/libgcj-${gcj.gcc.version}.jar" \
LIBGCJ="${gcj.cc}/share/java/libgcj-${gcj.cc.version}.jar" \
GCJ=gcj GCJH=gcjh GJAR=gjar \
-iC ../java all
'';