commit c4a686bcb7952c76e1c0b7d0e4f5317b7db2814d · pyrox.dev/nixpkgs

+14 -18

pkgs/development/compilers/emscripten/0001-emulate-clang-sysroot-include-logic.patch

···

       1
       1
       -
       From 4bbbb640934aa653bcfec0335798b77a8935b815 Mon Sep 17 00:00:00 2001

     

       1
       1
       +
       From 86fc9ce2b381748813b372f7e86909be6f955cbd Mon Sep 17 00:00:00 2001

     

       2
       2
        
       From: Yureka <yuka@yuka.dev>

     

       3
       3
        
       Date: Sat, 7 Aug 2021 09:16:46 +0200

     

       4
       4
        
       Subject: [PATCH] emulate clang 'sysroot + /include' logic

     
···

       16
       16
        
       Hence usage of -idirafter. Clang also documents an -isystem-after flag

     

       17
       17
        
       but it doesn't appear to work

     

       18
       18
        
       ---

     

       19
       19
       -
        emcc.py | 7 ++++++-

     

       20
       20
       -
        1 file changed, 6 insertions(+), 1 deletion(-)

     

       19
       19
       +
        emcc.py | 3 +++

     

       20
       20
       +
        1 file changed, 3 insertions(+)

     

       21
       21
        
       

     

       22
       22
        
       diff --git a/emcc.py b/emcc.py

     

       23
       23
       -
       index ba8d1b556..7d89644c5 100755

     

       23
       23
       +
       index 279f6d4d9..26e20e2cc 100644

     

       24
       24
        
       --- a/emcc.py

     

       25
       25
        
       +++ b/emcc.py

     

       26
       26
       -
       @@ -883,7 +883,12 @@ def parse_s_args(args):

     

       27
       27
       -
        

     

       28
       28
       -
        

     

       29
       29
       -
        def emsdk_cflags(user_args):

     

       30
       30
       -
       -  cflags = ['--sysroot=' + cache.get_sysroot(absolute=True)]

     

       31
       31
       -
       +  cflags = [

     

       32
       32
       -
       +    '--sysroot=' + cache.get_sysroot(absolute=True),

     

       33
       33
       -
       +    '-resource-dir=@resourceDir@',

     

       34
       34
       -
       +    '-idirafter' + cache.get_sysroot(absolute=True) + os.path.join('/include'),

     

       35
       35
       -
       +    '-iwithsysroot' + os.path.join('/include','c++','v1')

     

       36
       36
       -
       +  ]

     

       26
       26
       +
       @@ -400,6 +400,9 @@ def get_cflags(user_args, is_cxx):

     

       27
       27
       +
          # We add these to the user's flags (newargs), but not when building .s or .S assembly files

     

       28
       28
       +
          cflags = get_clang_flags(user_args)

     

       29
       29
       +
          cflags.append('--sysroot=' + cache.get_sysroot(absolute=True))

     

       30
       30
       +
       +  cflags.append('-resource-dir=@resourceDir@')

     

       31
       31
       +
       +  cflags.append('-idirafter' + cache.get_sysroot(absolute=True) + os.path.join('/include'))

     

       32
       32
       +
       +  cflags.append('-iwithsysroot' + os.path.join('/include','c++','v1'))

     

       37
       33
        
        

     

       38
       38
       -
          def array_contains_any_of(hay, needles):

     

       39
       39
       -
            for n in needles:

     

       34
       34
       +
          if settings.EMSCRIPTEN_TRACING:

     

       35
       35
       +
            cflags.append('-D__EMSCRIPTEN_TRACING__=1')

     

       40
       36
        
       -- 

     

       41
       41
       -
       2.40.0

     

       37
       37
       +
       2.42.0

     

       42
       38

+11 -4

pkgs/development/compilers/emscripten/default.nix

···

       8
       8
        
       

     

       9
       9
        
       stdenv.mkDerivation rec {

     

       10
       10
        
         pname = "emscripten";

     

       11
       11
       -
         version = "3.1.47";

     

       11
       11
       +
         version = "3.1.50";

     

       12
       12
        
       

     

       13
       13
        
         llvmEnv = symlinkJoin {

     

       14
       14
        
           name = "emscripten-llvm-${version}";

     
···

       32
       32
        
         src = fetchFromGitHub {

     

       33
       33
        
           owner = "emscripten-core";

     

       34
       34
        
           repo = "emscripten";

     

       35
       35
       -
           hash = "sha256-cRNkQ+7vUqJLNlf5dieeDcyT1jlBUeVxO8avoUvOPHI=";

     

       35
       35
       +
           hash = "sha256-iFZF+DxGaq279QPPugoLhYmoXmyLPkmn1x4rBCkdW+I=";

     

       36
       36
        
           rev = version;

     

       37
       37
        
         };

     

       38
       38
        
       

     
···

       42
       42
        
         patches = [

     

       43
       43
        
           (substituteAll {

     

       44
       44
        
             src = ./0001-emulate-clang-sysroot-include-logic.patch;

     

       45
       45
       -
             resourceDir = "${llvmEnv}/lib/clang/16/";

     

       45
       45
       +
             resourceDir = "${llvmEnv}/lib/clang/17/";

     

       46
       46
        
           })

     

       47
       47
        
         ];

     

       48
       48
        
       

     
···

       50
       50
        
           runHook preBuild

     

       51
       51
        
       

     

       52
       52
        
           patchShebangs .

     

       53
       53
       +
       

     

       54
       54
       +
           # emscripten 3.1.50 requires LLVM tip-of-tree instead of LLVM 17

     

       55
       55
       +
           sed -i -e "s/EXPECTED_LLVM_VERSION = 18/EXPECTED_LLVM_VERSION = 17.0/g" tools/shared.py

     

       53
       56
        
       

     

       54
       57
        
           # fixes cmake support

     

       55
       58
        
           sed -i -e "s/print \('emcc (Emscript.*\)/sys.stderr.write(\1); sys.stderr.flush()/g" emcc.py

     
···

       106
       109
        
               # TODO: get library cache to build with both enabled and function exported

     

       107
       110
        
               $out/bin/emcc $LTO $BIND test.c

     

       108
       111
        
               $out/bin/emcc $LTO $BIND -s RELOCATABLE test.c

     

       109
       109
       -
               $out/bin/emcc $LTO $BIND -s USE_PTHREADS test.c

     

       112
       112
       +
               # starting with emscripten 3.1.48+,

     

       113
       113
       +
               # to use pthreads, _emscripten_check_mailbox must be exported

     

       114
       114
       +
               # (see https://github.com/emscripten-core/emscripten/pull/20604)

     

       115
       115
       +
               # TODO: get library cache to build with pthreads at all

     

       116
       116
       +
               # $out/bin/emcc $LTO $BIND -s USE_PTHREADS test.c

     

       110
       117
        
             done

     

       111
       118
        
           done

     

       112
       119
        
           popd

+1 -1

pkgs/top-level/all-packages.nix

···

       7943
       7943
        
         easeprobe = callPackage ../tools/misc/easeprobe { };

     

       7944
       7944
        
       

     

       7945
       7945
        
         emscripten = callPackage ../development/compilers/emscripten {

     

       7946
       7946
       -
           llvmPackages = llvmPackages_16;

     

       7946
       7946
       +
           llvmPackages = llvmPackages_17;

     

       7947
       7947
        
         };

     

       7948
       7948
        
       

     

       7949
       7949
        
         emscriptenPackages = recurseIntoAttrs (callPackage ./emscripten-packages.nix { });