@@ -61,18 +61,18 @@ in
6161 configureFlags = let
6262 isCross = stdenv.hostPlatform != stdenv.buildPlatform;
6363 host = stdenv.hostPlatform.platform;
64− isArm = stdenv.hostPlatform.isArm;
64+ isAarch32 = stdenv.hostPlatform.isAarch32;
6565 in sharedConfigureFlags ++ [
6666 "--without-dtrace"
6767 ] ++ (optionals isCross [
6868 "--cross-compiling"
6969 "--without-intl"
7070 "--without-snapshot"
71− ]) ++ (optionals (isCross && isArm && hasAttr "fpu" host.gcc) [
71+ ]) ++ (optionals (isCross && isAarch32 && hasAttr "fpu" host.gcc) [
7272 "--with-arm-fpu=${host.gcc.fpu}"
73− ]) ++ (optionals (isCross && isArm && hasAttr "float-abi" host.gcc) [
73+ ]) ++ (optionals (isCross && isAarch32 && hasAttr "float-abi" host.gcc) [
7474 "--with-arm-float-abi=${host.gcc.float-abi}"
75− ]) ++ (optionals (isCross && isArm) [
75+ ]) ++ (optionals (isCross && isAarch32) [
7676 "--dest-cpu=arm"
7777 ]) ++ extraConfigFlags;
7878