Skip to content

Commit

Permalink
gcc-4.8: build Objective-C/C++ support on darwin
Browse files Browse the repository at this point in the history
  • Loading branch information
jwiegley committed May 31, 2014
1 parent 2f0ecbd commit 0369769
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion 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
Expand Down Expand Up @@ -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++" ]
)
)
Expand Down Expand Up @@ -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;

Expand Down

2 comments on commit 0369769

@jwiegley
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This commit is from @vcunat. My apologies, I forgot to re-import the change using git am so that you would have attribution.

@vcunat
Copy link
Member

@vcunat vcunat commented on 0369769 May 31, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've got no use for those bitcoins anyway ;-)

Please sign in to comment.