icc: Propagate gcc as is required to build
This commit is contained in:
parent
a78f0caec9
commit
99b716db87
@ -20,6 +20,9 @@ in wrapCCWith rec {
|
|||||||
echo "-L${gcc.cc}/lib/gcc/${targetConfig}/${gcc.version}" >> $out/nix-support/cc-ldflags
|
echo "-L${gcc.cc}/lib/gcc/${targetConfig}/${gcc.version}" >> $out/nix-support/cc-ldflags
|
||||||
echo "-L${gcc.cc.lib}/lib" >> $out/nix-support/cc-ldflags
|
echo "-L${gcc.cc.lib}/lib" >> $out/nix-support/cc-ldflags
|
||||||
|
|
||||||
|
cat "${icc-unwrapped}/nix-support/propagated-build-inputs" >> \
|
||||||
|
$out/nix-support/propagated-build-inputs
|
||||||
|
|
||||||
echo "export INTEL_LICENSE_FILE=${intel-license}" \
|
echo "export INTEL_LICENSE_FILE=${intel-license}" \
|
||||||
>> $out/nix-support/setup-hook
|
>> $out/nix-support/setup-hook
|
||||||
|
|
||||||
|
@ -28,9 +28,13 @@ stdenv.mkDerivation rec {
|
|||||||
rpmextract
|
rpmextract
|
||||||
autoPatchelfHook
|
autoPatchelfHook
|
||||||
gcc.cc.lib
|
gcc.cc.lib
|
||||||
|
gcc
|
||||||
intel-mpi
|
intel-mpi
|
||||||
];
|
];
|
||||||
|
|
||||||
|
# The gcc package is required for building other programs
|
||||||
|
propagatedBuildInputs = [ gcc ];
|
||||||
|
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
rpmextract rpm/intel-icc-*.rpm
|
rpmextract rpm/intel-icc-*.rpm
|
||||||
rpmextract rpm/intel-comp-*.rpm
|
rpmextract rpm/intel-comp-*.rpm
|
||||||
|
Loading…
Reference in New Issue
Block a user