Unverified Commit cd27a5b4 authored by John Ericson's avatar John Ericson Committed by GitHub
Browse files

Merge pull request #82131 from Ericson2314/bsd-cross 

FreeBSD packages: Init at 13.1
parents 92ad187a 0afe9d1f

doc/stdenv/meta.chapter.md

+2 −2
Original line number Diff line number Diff line
@@ -44,8 +44,8 @@ $ nix-env -qa hello --json 
                "mips32-linux",

                "x86_64-darwin",

                "i686-cygwin",

                "i686-freebsd",

                "x86_64-freebsd",

                "i686-freebsd13",

                "x86_64-freebsd13",

                "i686-openbsd",

                "x86_64-openbsd"

            ],

lib/systems/default.nix

+2 −1
Original line number Diff line number Diff line
@@ -47,9 +47,10 @@ rec { 
        else if final.isUClibc              then "uclibc"

        else if final.isAndroid             then "bionic"

        else if final.isLinux /* default */ then "glibc"

        else if final.isFreeBSD             then "fblibc"

        else if final.isNetBSD              then "nblibc"

        else if final.isAvr                 then "avrlibc"

        else if final.isNone                then "newlib"

        else if final.isNetBSD              then "nblibc"

        # TODO(@Ericson2314) think more about other operating systems

        else                                     "native/impure";

      # Choose what linker we wish to use by default. Someday we might also

lib/systems/doubles.nix

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ let 
    "x86_64-darwin" "i686-darwin" "aarch64-darwin" "armv7a-darwin"



    # FreeBSD

    "i686-freebsd" "x86_64-freebsd"

    "i686-freebsd13" "x86_64-freebsd13"



    # Genode

    "aarch64-genode" "i686-genode" "x86_64-genode"

lib/systems/examples.nix

+5 −2
Original line number Diff line number Diff line
@@ -303,15 +303,18 @@ rec { 


  # BSDs



  x86_64-freebsd = {

    config = "x86_64-unknown-freebsd13";

    useLLVM = true;

  };



  x86_64-netbsd = {

    config = "x86_64-unknown-netbsd";

    libc = "nblibc";

  };



  # this is broken and never worked fully

  x86_64-netbsd-llvm = {

    config = "x86_64-unknown-netbsd";

    libc = "nblibc";

    useLLVM = true;

  };

lib/systems/inspect.nix

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ rec { 
    isiOS          = { kernel = kernels.ios; };

    isLinux        = { kernel = kernels.linux; };

    isSunOS        = { kernel = kernels.solaris; };

    isFreeBSD      = { kernel = kernels.freebsd; };

    isFreeBSD      = { kernel = { name = "freebsd"; }; };

    isNetBSD       = { kernel = kernels.netbsd; };

    isOpenBSD      = { kernel = kernels.openbsd; };

    isWindows      = { kernel = kernels.windows; };