diff options
| author | Aaron Janse <aaron@ajanse.me> | 2020-07-21 13:11:36 -0700 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2020-11-27 13:27:27 +0000 |
| commit | 264f67859c87de433106ff97d00151b79dabc5ed (patch) | |
| tree | aaf1eae2da47ad38063725dcd9764f85c8af9621 /nixpkgs/pkgs/development/compilers | |
| parent | b17052ae9306cad34fd83bfe1f4f830d171052d4 (diff) | |
| download | nixlib-264f67859c87de433106ff97d00151b79dabc5ed.tar nixlib-264f67859c87de433106ff97d00151b79dabc5ed.tar.gz nixlib-264f67859c87de433106ff97d00151b79dabc5ed.tar.bz2 nixlib-264f67859c87de433106ff97d00151b79dabc5ed.tar.lz nixlib-264f67859c87de433106ff97d00151b79dabc5ed.tar.xz nixlib-264f67859c87de433106ff97d00151b79dabc5ed.tar.zst nixlib-264f67859c87de433106ff97d00151b79dabc5ed.zip | |
redox: add as target
(cherry picked from commit 60fd049b6552d73a5162109e7d8aa0839b54c398)
Diffstat (limited to 'nixpkgs/pkgs/development/compilers')
| -rw-r--r-- | nixpkgs/pkgs/development/compilers/gcc/6/default.nix | 13 | ||||
| -rw-r--r-- | nixpkgs/pkgs/development/compilers/rust/rustc.nix | 2 |
2 files changed, 10 insertions, 5 deletions
diff --git a/nixpkgs/pkgs/development/compilers/gcc/6/default.nix b/nixpkgs/pkgs/development/compilers/gcc/6/default.nix index a817b083f281..a2f034a4827f 100644 --- a/nixpkgs/pkgs/development/compilers/gcc/6/default.nix +++ b/nixpkgs/pkgs/development/compilers/gcc/6/default.nix @@ -64,9 +64,9 @@ let majorVersion = "6"; inherit (stdenv) buildPlatform hostPlatform targetPlatform; - patches = - [ ../use-source-date-epoch.patch ./0001-Fix-build-for-glibc-2.31.patch ] - ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch + patches = optionals (!stdenv.targetPlatform.isRedox) [ + ../use-source-date-epoch.patch ./0001-Fix-build-for-glibc-2.31.patch + ] ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch ++ optional noSysDirs ../no-sys-dirs.patch ++ optional langAda ../gnat-cflags.patch ++ optional langFortran ../gfortran-driving.patch @@ -120,6 +120,11 @@ stdenv.mkDerivation ({ repo = "gcc-vc4"; rev = "e90ff43f9671c760cf0d1dd62f569a0fb9bf8918"; sha256 = "0gxf66hwqk26h8f853sybphqa5ca0cva2kmrw5jsiv6139g0qnp8"; + } else if stdenv.targetPlatform.isRedox then fetchFromGitHub { + owner = "redox-os"; + repo = "gcc"; + rev = "f360ac095028d286fc6dde4d02daed48f59813fa"; # `redox` branch + sha256 = "1an96h8l58pppyh3qqv90g8hgcfd9hj7igvh2gigmkxbrx94khfl"; } else fetchurl { url = "mirror://gnu/gcc/gcc-${version}/gcc-${version}.tar.xz"; sha256 = "0i89fksfp6wr1xg9l8296aslcymv2idn60ip31wr9s4pwin7kwby"; @@ -182,7 +187,7 @@ stdenv.mkDerivation ({ nativeBuildInputs = [ texinfo which gettext ] ++ (optional (perl != null) perl) ++ (optional javaAwtGtk pkgconfig) - ++ (optional (stdenv.targetPlatform.isVc4) flex); + ++ (optional (with stdenv.targetPlatform; isVc4 || isRedox) flex); # For building runtime libs depsBuildTarget = diff --git a/nixpkgs/pkgs/development/compilers/rust/rustc.nix b/nixpkgs/pkgs/development/compilers/rust/rustc.nix index 6b3d973f6dce..65d8920c4a4c 100644 --- a/nixpkgs/pkgs/development/compilers/rust/rustc.nix +++ b/nixpkgs/pkgs/development/compilers/rust/rustc.nix @@ -90,7 +90,7 @@ in stdenv.mkDerivation rec { "${setBuild}.llvm-config=${llvmSharedForBuild}/bin/llvm-config" "${setHost}.llvm-config=${llvmSharedForHost}/bin/llvm-config" "${setTarget}.llvm-config=${llvmSharedForTarget}/bin/llvm-config" - ] ++ optionals stdenv.isLinux [ + ] ++ optionals (stdenv.isLinux && !stdenv.targetPlatform.isRedox) [ "--enable-profiler" # build libprofiler_builtins ]; |