ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-15 03:15:56 +03:00
Code Issues Projects Releases Wiki Activity

gcc: Use configurePlatforms to control --build, --host, and --target

Browse Source
This commit is contained in:
John Ericson 2017-08-18 13:54:09 -04:00
parent 9884a3b17a
commit 71186e7345
7 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/compilers/gcc/4.5/default.nix
View File

@ -73,7 +73,6 @@ let version = "4.5.4";
crossMingw = (targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt"); crossMingw = (targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt");
crossConfigureFlags = crossConfigureFlags =
"--target=${targetPlatform.config}" +
withArch + withArch +
withCpu + withCpu +
withAbi + withAbi +
@ -231,6 +230,8 @@ stdenv.mkDerivation ({
++ (optionals langVhdl [gnat]) ++ (optionals langVhdl [gnat])
; ;
# TODO(@Ericson2314): Always pass "--target" and always prefix.
configurePlatforms = [ "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"}
@ -313,7 +314,6 @@ stdenv.mkDerivation ({
${if langAda then " --enable-libada" else ""} ${if langAda then " --enable-libada" else ""}
${if targetplatform == hostPlatform && targetPlatform.isi686 then "--with-arch=i686" else ""} ${if targetplatform == hostPlatform && targetPlatform.isi686 then "--with-arch=i686" else ""}
${if targetPlatform != hostPlatform then crossConfigureFlags else ""} ${if targetPlatform != hostPlatform then crossConfigureFlags else ""}
--target=${targetPlatform.config}
''; '';
}; };

4
pkgs/development/compilers/gcc/4.8/default.nix
View File

@ -142,7 +142,6 @@ let version = "4.8.5";
withFloat = if gccFloat != null then " --with-float=${gccFloat}" else ""; withFloat = if gccFloat != null then " --with-float=${gccFloat}" else "";
withMode = if gccMode != null then " --with-mode=${gccMode}" else ""; withMode = if gccMode != null then " --with-mode=${gccMode}" else "";
in in
"--target=${targetPlatform.config}" +
withArch + withArch +
withCpu + withCpu +
withAbi + withAbi +
@ -317,6 +316,8 @@ stdenv.mkDerivation ({
dontDisableStatic = true; dontDisableStatic = true;
# TODO(@Ericson2314): Always pass "--target" and always prefix.
configurePlatforms = [ "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 " +
@ -436,7 +437,6 @@ stdenv.mkDerivation ({
) )
} }
${if langAda then " --enable-libada" else ""} ${if langAda then " --enable-libada" else ""}
--target=${targetPlatform.config}
${xwithArch} ${xwithArch}
${xwithCpu} ${xwithCpu}
${xwithAbi} ${xwithAbi}

4
pkgs/development/compilers/gcc/4.9/default.nix
View File

@ -136,7 +136,6 @@ let version = "4.9.4";
withFloat = if gccFloat != null then " --with-float=${gccFloat}" else ""; withFloat = if gccFloat != null then " --with-float=${gccFloat}" else "";
withMode = if gccMode != null then " --with-mode=${gccMode}" else ""; withMode = if gccMode != null then " --with-mode=${gccMode}" else "";
in in
"--target=${targetPlatform.config}" +
withArch + withArch +
withCpu + withCpu +
withAbi + withAbi +
@ -317,6 +316,8 @@ stdenv.mkDerivation ({
dontDisableStatic = true; dontDisableStatic = true;
# TODO(@Ericson2314): Always pass "--target" and always prefix.
configurePlatforms = [ "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 " +
@ -434,7 +435,6 @@ stdenv.mkDerivation ({
) )
} }
${if langAda then " --enable-libada" else ""} ${if langAda then " --enable-libada" else ""}
--target=${targetPlatform.config}
${xwithArch} ${xwithArch}
${xwithCpu} ${xwithCpu}
${xwithAbi} ${xwithAbi}

6
pkgs/development/compilers/gcc/5/default.nix
View File

@ -142,7 +142,6 @@ let version = "5.4.0";
withFloat = if gccFloat != null then " --with-float=${gccFloat}" else ""; withFloat = if gccFloat != null then " --with-float=${gccFloat}" else "";
withMode = if gccMode != null then " --with-mode=${gccMode}" else ""; withMode = if gccMode != null then " --with-mode=${gccMode}" else "";
in in
"--target=${targetPlatform.config}" +
withArch + withArch +
withCpu + withCpu +
withAbi + withAbi +
@ -334,6 +333,8 @@ stdenv.mkDerivation ({
dontDisableStatic = true; dontDisableStatic = true;
# TODO(@Ericson2314): Always pass "--target" and always prefix.
configurePlatforms = [ "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 " +
@ -451,9 +452,6 @@ stdenv.mkDerivation ({
) )
} }
${if langAda then " --enable-libada" else ""} ${if langAda then " --enable-libada" else ""}
--build=${buildPlatform.config}
--host=${hostPlatform.config}
--target=${targetPlatform.config}
${xwithArch} ${xwithArch}
${xwithCpu} ${xwithCpu}
${xwithAbi} ${xwithAbi}

4
pkgs/development/compilers/gcc/6/default.nix
View File

@ -136,7 +136,6 @@ let version = "6.4.0";
withFloat = if gccFloat != null then " --with-float=${gccFloat}" else ""; withFloat = if gccFloat != null then " --with-float=${gccFloat}" else "";
withMode = if gccMode != null then " --with-mode=${gccMode}" else ""; withMode = if gccMode != null then " --with-mode=${gccMode}" else "";
in in
"--target=${targetPlatform.config}" +
withArch + withArch +
withCpu + withCpu +
withAbi + withAbi +
@ -326,6 +325,8 @@ stdenv.mkDerivation ({
dontDisableStatic = true; dontDisableStatic = true;
# TODO(@Ericson2314): Always pass "--target" and always prefix.
configurePlatforms = [ "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 " +
@ -443,7 +444,6 @@ stdenv.mkDerivation ({
) )
} }
${if langAda then " --enable-libada" else ""} ${if langAda then " --enable-libada" else ""}
--target=${targetPlatform.config}
${xwithArch} ${xwithArch}
${xwithCpu} ${xwithCpu}
${xwithAbi} ${xwithAbi}

4
pkgs/development/compilers/gcc/7/default.nix
View File

@ -137,7 +137,6 @@ let version = "7.1.0";
withFloat = if gccFloat != null then " --with-float=${gccFloat}" else ""; withFloat = if gccFloat != null then " --with-float=${gccFloat}" else "";
withMode = if gccMode != null then " --with-mode=${gccMode}" else ""; withMode = if gccMode != null then " --with-mode=${gccMode}" else "";
in in
"--target=${targetPlatform.config}" +
withArch + withArch +
withCpu + withCpu +
withAbi + withAbi +
@ -328,6 +327,8 @@ stdenv.mkDerivation ({
dontDisableStatic = true; dontDisableStatic = true;
# TODO(@Ericson2314): Always pass "--target" and always prefix.
configurePlatforms = [ "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 " +
@ -445,7 +446,6 @@ stdenv.mkDerivation ({
) )
} }
${if langAda then " --enable-libada" else ""} ${if langAda then " --enable-libada" else ""}
--target=${targetPlatform.config}
${xwithArch} ${xwithArch}
${xwithCpu} ${xwithCpu}
${xwithAbi} ${xwithAbi}

4
pkgs/development/compilers/gcc/snapshot/default.nix
View File

@ -137,7 +137,6 @@ let version = "7-20170409";
withFloat = if gccFloat != null then " --with-float=${gccFloat}" else ""; withFloat = if gccFloat != null then " --with-float=${gccFloat}" else "";
withMode = if gccMode != null then " --with-mode=${gccMode}" else ""; withMode = if gccMode != null then " --with-mode=${gccMode}" else "";
in in
"--target=${targetPlatform.config}" +
withArch + withArch +
withCpu + withCpu +
withAbi + withAbi +
@ -315,6 +314,8 @@ stdenv.mkDerivation ({
dontDisableStatic = true; dontDisableStatic = true;
# TODO(@Ericson2314): Always pass "--target" and always prefix.
configurePlatforms = [ "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 " +
@ -432,7 +433,6 @@ stdenv.mkDerivation ({
) )
} }
${if langAda then " --enable-libada" else ""} ${if langAda then " --enable-libada" else ""}
--target=${targetPlatform.config}
${xwithArch} ${xwithArch}
${xwithCpu} ${xwithCpu}
${xwithAbi} ${xwithAbi}