From 0369769bd9843c7ddaab1f9ba77732337abfaee2 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Sat, 31 May 2014 19:37:49 +0000 Subject: [PATCH] gcc-4.8: build Objective-C/C++ support on darwin --- pkgs/development/compilers/gcc/4.8/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index 01f7ea6e3e6..902cba392f8 100644 --- a/pkgs/development/compilers/gcc/4.8/default.nix +++ b/pkgs/development/compilers/gcc/4.8/default.nix @@ -1,5 +1,7 @@ { stdenv, fetchurl, noSysDirs , langC ? true, langCC ? true, langFortran ? false +, langObjC ? stdenv.isDarwin +, langObjCpp ? stdenv.isDarwin , langJava ? false , langAda ? false , langVhdl ? false @@ -352,6 +354,8 @@ stdenv.mkDerivation ({ ++ optional langAda "ada" ++ optional langVhdl "vhdl" ++ optional langGo "go" + ++ optional langObjC "objc" + ++ optional langObjCpp "obj-c++" ++ optionals crossDarwin [ "objc" "obj-c++" ] ) ) @@ -490,7 +494,7 @@ stdenv.mkDerivation ({ else null; passthru = - { inherit langC langCC langAda langFortran langVhdl langGo enableMultilib version; }; + { inherit langC langCC langObjC langObjCpp langAda langFortran langVhdl langGo enableMultilib version; }; inherit enableParallelBuilding;