diff options
| author | Shea Levy <shea@shealevy.com> | 2011-08-30 13:46:05 +0000 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2011-08-30 13:46:05 +0000 |
| commit | 9496f3767b9503f115aa93e716253d0fa2c33116 (patch) | |
| tree | 88f779b08c3ce31e26a830aed7f6ed6b52679f4d /pkgs | |
| parent | 5058e62c564638d4836b5ff89c839a044ad02743 (diff) | |
gcc-apple64: Enable Objective C
darwin-updates was just merged, so I'm taking the liberty of messing with darwin's stdenv svn path=/nixpkgs/trunk/; revision=28929
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/compilers/gcc-apple64/builder.sh | 3 | ||||
| -rw-r--r-- | pkgs/development/compilers/gcc-apple64/default.nix | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/pkgs/development/compilers/gcc-apple64/builder.sh b/pkgs/development/compilers/gcc-apple64/builder.sh index ce0baa1597a8b..6072aef9d5911 100644 --- a/pkgs/development/compilers/gcc-apple64/builder.sh +++ b/pkgs/development/compilers/gcc-apple64/builder.sh @@ -61,6 +61,9 @@ preConfigure() { if test -n "$langF77"; then langs="$langs,f95" fi + if test -n "$langObjC"; then + langs="$langs,objc" + fi # Perform the build in a different directory. mkdir ../build diff --git a/pkgs/development/compilers/gcc-apple64/default.nix b/pkgs/development/compilers/gcc-apple64/default.nix index ffb29da2f80c9..e2f70fbc1f568 100644 --- a/pkgs/development/compilers/gcc-apple64/default.nix +++ b/pkgs/development/compilers/gcc-apple64/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, noSysDirs -, langC ? true, langCC ? true, langF77 ? false +, langC ? true, langCC ? true, langObjC ? true, langF77 ? false , profiledCompiler ? false , gmp ? null, mpfr ? null, bison ? null, flex ? null }: @@ -34,5 +34,5 @@ stdenv.mkDerivation ({ patches = [./pass-cxxcpp.patch ] ++ (if noSysDirs then [./no-sys-dirs.patch] else []); - inherit noSysDirs langC langCC langF77 profiledCompiler; + inherit noSysDirs langC langCC langF77 langObjC profiledCompiler; } // (if langF77 then {buildInputs = [gmp mpfr bison flex];} else {})) |