Merge pull request #146874 from trofi/fix-cernlib-for-binutils-2.36

cernlib: binutils 2.37 fix
This commit is contained in:
Dmitry Kalinkin 2021-11-21 16:34:31 -05:00 committed by GitHub
commit ac833956f0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -23,6 +23,8 @@ stdenv.mkDerivation rec {
--replace "# define MakeCmd gmake" "# define MakeCmd make" --replace "# define MakeCmd gmake" "# define MakeCmd make"
substituteInPlace 2006/src/config/lnxLib.rules \ substituteInPlace 2006/src/config/lnxLib.rules \
--replace "# lib" "// lib" --replace "# lib" "// lib"
# binutils 2.37 fix
substituteInPlace 2006/src/config/Imake.tmpl --replace "clq" "cq"
''; '';
configurePhase = '' configurePhase = ''
@ -39,12 +41,12 @@ stdenv.mkDerivation rec {
cd $CERN_ROOT/build cd $CERN_ROOT/build
$CVSCOSRC/config/imake_boot $CVSCOSRC/config/imake_boot
make bin/kuipc make -j $NIX_BUILD_CORES bin/kuipc
make scripts/Makefile make -j $NIX_BUILD_CORES scripts/Makefile
pushd scripts pushd scripts
make install.bin make -j $NIX_BUILD_CORES install.bin
popd popd
make make -j $NIX_BUILD_CORES
''; '';
installPhase = '' installPhase = ''