gcc: Add configurePlatforms
exception for Arm 32
...just as we did for binutils. When the underlying issue is resolved (probably with a configure script patch or lib/systems/parse.nix change), this should be reverted.
This commit is contained in:
parent
71186e7345
commit
ebc9b161cd
@ -231,7 +231,12 @@ stdenv.mkDerivation ({
|
|||||||
;
|
;
|
||||||
|
|
||||||
# TODO(@Ericson2314): Always pass "--target" and always prefix.
|
# TODO(@Ericson2314): Always pass "--target" and always prefix.
|
||||||
configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
|
configurePlatforms =
|
||||||
|
# TODO(@Ericson2314): Figure out what's going wrong with Arm
|
||||||
|
if hostPlatform == targetPlatform && targetPlatform.isArm32
|
||||||
|
then []
|
||||||
|
else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
|
||||||
|
|
||||||
configureFlags = "
|
configureFlags = "
|
||||||
${if enableMultilib then "" else "--disable-multilib"}
|
${if enableMultilib then "" else "--disable-multilib"}
|
||||||
${if enableShared then "" else "--disable-shared"}
|
${if enableShared then "" else "--disable-shared"}
|
||||||
|
@ -317,7 +317,12 @@ stdenv.mkDerivation ({
|
|||||||
dontDisableStatic = true;
|
dontDisableStatic = true;
|
||||||
|
|
||||||
# TODO(@Ericson2314): Always pass "--target" and always prefix.
|
# TODO(@Ericson2314): Always pass "--target" and always prefix.
|
||||||
configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
|
configurePlatforms =
|
||||||
|
# TODO(@Ericson2314): Figure out what's going wrong with Arm
|
||||||
|
if hostPlatform == targetPlatform && targetPlatform.isArm32
|
||||||
|
then []
|
||||||
|
else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
|
||||||
|
|
||||||
configureFlags = "
|
configureFlags = "
|
||||||
${if hostPlatform.isSunOS then
|
${if hostPlatform.isSunOS then
|
||||||
" --enable-long-long --enable-libssp --enable-threads=posix --disable-nls --enable-__cxa_atexit " +
|
" --enable-long-long --enable-libssp --enable-threads=posix --disable-nls --enable-__cxa_atexit " +
|
||||||
|
@ -317,7 +317,12 @@ stdenv.mkDerivation ({
|
|||||||
dontDisableStatic = true;
|
dontDisableStatic = true;
|
||||||
|
|
||||||
# TODO(@Ericson2314): Always pass "--target" and always prefix.
|
# TODO(@Ericson2314): Always pass "--target" and always prefix.
|
||||||
configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
|
configurePlatforms =
|
||||||
|
# TODO(@Ericson2314): Figure out what's going wrong with Arm
|
||||||
|
if hostPlatform == targetPlatform && targetPlatform.isArm32
|
||||||
|
then []
|
||||||
|
else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
|
||||||
|
|
||||||
configureFlags = "
|
configureFlags = "
|
||||||
${if hostPlatform.isSunOS then
|
${if hostPlatform.isSunOS then
|
||||||
" --enable-long-long --enable-libssp --enable-threads=posix --disable-nls --enable-__cxa_atexit " +
|
" --enable-long-long --enable-libssp --enable-threads=posix --disable-nls --enable-__cxa_atexit " +
|
||||||
|
@ -334,7 +334,12 @@ stdenv.mkDerivation ({
|
|||||||
dontDisableStatic = true;
|
dontDisableStatic = true;
|
||||||
|
|
||||||
# TODO(@Ericson2314): Always pass "--target" and always prefix.
|
# TODO(@Ericson2314): Always pass "--target" and always prefix.
|
||||||
configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
|
configurePlatforms =
|
||||||
|
# TODO(@Ericson2314): Figure out what's going wrong with Arm
|
||||||
|
if hostPlatform == targetPlatform && targetPlatform.isArm32
|
||||||
|
then []
|
||||||
|
else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
|
||||||
|
|
||||||
configureFlags = "
|
configureFlags = "
|
||||||
${if hostPlatform.isSunOS then
|
${if hostPlatform.isSunOS then
|
||||||
" --enable-long-long --enable-libssp --enable-threads=posix --disable-nls --enable-__cxa_atexit " +
|
" --enable-long-long --enable-libssp --enable-threads=posix --disable-nls --enable-__cxa_atexit " +
|
||||||
|
@ -326,7 +326,12 @@ stdenv.mkDerivation ({
|
|||||||
dontDisableStatic = true;
|
dontDisableStatic = true;
|
||||||
|
|
||||||
# TODO(@Ericson2314): Always pass "--target" and always prefix.
|
# TODO(@Ericson2314): Always pass "--target" and always prefix.
|
||||||
configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
|
configurePlatforms =
|
||||||
|
# TODO(@Ericson2314): Figure out what's going wrong with Arm
|
||||||
|
if hostPlatform == targetPlatform && targetPlatform.isArm32
|
||||||
|
then []
|
||||||
|
else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
|
||||||
|
|
||||||
configureFlags = "
|
configureFlags = "
|
||||||
${if hostPlatform.isSunOS then
|
${if hostPlatform.isSunOS then
|
||||||
" --enable-long-long --enable-libssp --enable-threads=posix --disable-nls --enable-__cxa_atexit " +
|
" --enable-long-long --enable-libssp --enable-threads=posix --disable-nls --enable-__cxa_atexit " +
|
||||||
|
@ -328,7 +328,12 @@ stdenv.mkDerivation ({
|
|||||||
dontDisableStatic = true;
|
dontDisableStatic = true;
|
||||||
|
|
||||||
# TODO(@Ericson2314): Always pass "--target" and always prefix.
|
# TODO(@Ericson2314): Always pass "--target" and always prefix.
|
||||||
configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
|
configurePlatforms =
|
||||||
|
# TODO(@Ericson2314): Figure out what's going wrong with Arm
|
||||||
|
if hostPlatform == targetPlatform && targetPlatform.isArm32
|
||||||
|
then []
|
||||||
|
else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
|
||||||
|
|
||||||
configureFlags = "
|
configureFlags = "
|
||||||
${if hostPlatform.isSunOS then
|
${if hostPlatform.isSunOS then
|
||||||
" --enable-long-long --enable-libssp --enable-threads=posix --disable-nls --enable-__cxa_atexit " +
|
" --enable-long-long --enable-libssp --enable-threads=posix --disable-nls --enable-__cxa_atexit " +
|
||||||
|
@ -315,7 +315,12 @@ stdenv.mkDerivation ({
|
|||||||
dontDisableStatic = true;
|
dontDisableStatic = true;
|
||||||
|
|
||||||
# TODO(@Ericson2314): Always pass "--target" and always prefix.
|
# TODO(@Ericson2314): Always pass "--target" and always prefix.
|
||||||
configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
|
configurePlatforms =
|
||||||
|
# TODO(@Ericson2314): Figure out what's going wrong with Arm
|
||||||
|
if hostPlatform == targetPlatform && targetPlatform.isArm32
|
||||||
|
then []
|
||||||
|
else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
|
||||||
|
|
||||||
configureFlags = "
|
configureFlags = "
|
||||||
${if hostPlatform.isSunOS then
|
${if hostPlatform.isSunOS then
|
||||||
" --enable-long-long --enable-libssp --enable-threads=posix --disable-nls --enable-__cxa_atexit " +
|
" --enable-long-long --enable-libssp --enable-threads=posix --disable-nls --enable-__cxa_atexit " +
|
||||||
|
Loading…
x
Reference in New Issue
Block a user