Skip to content

Commit 8b96f01

Browse files
lovasoalovasoa
committed
Deploying to gh-pages from @ e7d8ac6 🚀
1 parent aed2866 commit 8b96f01

File tree

21 files changed

+275
-349
lines changed

21 files changed

+275
-349
lines changed

‎.emsdk-cache/emsdk-master/.dockerignore‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,4 @@
1818
.emscripten_sanity_wasm
1919
.flake8
2020
emscripten-releases-tot.txt
21-
legacy-*-tags.txt
2221
README.md

‎.emsdk-cache/emsdk-master/bazel/WORKSPACE‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ http_archive(
88

99
load("@build_bazel_rules_nodejs//:index.bzl", "npm_install")
1010

11-
# emscripten 2.0.12
11+
# emscripten 2.0.14
1212
http_archive(
1313
name = "emscripten",
14-
sha256 = "bfff9fb0326363c12e19b542f27a5f12cedbfc310f30621dc497c9af51d2d2e3",
14+
sha256 = "e466cd47ddd4bf0acd645412fdf08eda6d232484e48e5a2643e08062a7a4cf56",
1515
strip_prefix = "install",
16-
url = "https://storage.googleapis.com/webassembly/emscripten-releases-builds/linux/dcf819a7821f8db0c8f15ac336fea8960ec204f5/wasm-binaries.tbz2",
16+
url = "https://storage.googleapis.com/webassembly/emscripten-releases-builds/linux/fc5562126762ab26c4757147a3b4c24e85a7289e/wasm-binaries.tbz2",
1717
build_file = "//emscripten_toolchain:emscripten.BUILD",
1818
type = "tar.bz2",
1919
)

‎.emsdk-cache/emsdk-master/bazel/emscripten_toolchain/crosstool.bzl‎

Lines changed: 10 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,8 @@ def _impl(ctx):
7070

7171
cc_target_os = "emscripten"
7272
emscripten_version = ctx.attr.emscripten_version
73-
emscripten_root = "external/emscripten/" + emscripten_version
7473

75-
builtin_sysroot = None
74+
builtin_sysroot = "external/emscripten/emscripten/cache/sysroot"
7675

7776
################################################################
7877
# Tools
@@ -513,14 +512,7 @@ def _impl(ctx):
513512
# Language Features
514513
flag_set(
515514
actions = all_cpp_compile_actions,
516-
flags = [
517-
"-std=gnu++17",
518-
"-nostdinc",
519-
"-Xclang",
520-
"-nobuiltininc",
521-
"-Xclang",
522-
"-nostdsysteminc",
523-
],
515+
flags = ["-std=gnu++17", "-nostdinc", "-nostdinc++",],
524516
),
525517

526518
# Emscripten-specific settings:
@@ -904,30 +896,10 @@ def _impl(ctx):
904896
actions = preprocessor_compile_actions +
905897
[ACTION_NAMES.cc_flags_make_variable],
906898
flags = [
907-
"-isystem",
908-
emscripten_root + "/system/lib/libc/musl/arch/emscripten",
909-
"-isystem",
910-
emscripten_root + "/system/lib/libc/musl/arch/js",
911-
"-isystem",
912-
emscripten_root + "/system/local/include",
913-
"-isystem",
914-
emscripten_root + "/system/include/compat",
915-
"-isystem",
916-
emscripten_root + "/system/include",
917-
"-isystem",
918-
emscripten_root + "/system/include/libcxx",
919-
"-isystem",
920-
emscripten_root + "/system/lib/libcxxabi/include",
921-
"-isystem",
922-
emscripten_root + "/system/lib/compiler-rt/include",
923-
"-isystem",
924-
emscripten_root + "/system/include/libc",
925-
"-isystem",
926-
emscripten_root + "/system/include/gfx",
927-
"-isystem",
928-
emscripten_root + "/system/include/SDL",
929-
"-isystem",
930-
emscripten_root + "/lib/clang/12.0.0/include",
899+
"-iwithsysroot" + "/include/c++/v1",
900+
"-iwithsysroot" + "/include/compat",
901+
"-iwithsysroot" + "/include",
902+
"-isystem", "external/emscripten/lib/clang/13.0.0/include",
931903
],
932904
),
933905
# Inputs and outputs
@@ -1070,18 +1042,10 @@ def _impl(ctx):
10701042
features.append(crosstool_default_flags_feature)
10711043

10721044
cxx_builtin_include_directories = [
1073-
emscripten_version + "/system/lib/libc/musl/arch/emscripten",
1074-
emscripten_version + "/system/lib/libc/musl/arch/js",
1075-
emscripten_version + "/system/local/include",
1076-
emscripten_version + "/system/include/compat",
1077-
emscripten_version + "/system/include",
1078-
emscripten_version + "/system/include/libcxx",
1079-
emscripten_version + "/system/lib/compiler-rt/include",
1080-
emscripten_version + "/system/lib/libcxxabi/include",
1081-
emscripten_version + "/system/include/libc",
1082-
emscripten_version + "/system/include/gfx",
1083-
emscripten_version + "/system/include/SDL",
1084-
emscripten_version + "/lib/clang/12.0.0/include",
1045+
"external/emscripten/emscripten/cache/sysroot/include/c++/v1",
1046+
"external/emscripten/emscripten/cache/sysroot/include/compat",
1047+
"external/emscripten/emscripten/cache/sysroot/include",
1048+
"external/emscripten/lib/clang/13.0.0/include",
10851049
]
10861050

10871051
artifact_name_patterns = []

‎.emsdk-cache/emsdk-master/bazel/emscripten_toolchain/emscripten_config‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,10 @@ import platform
33

44
ROOT_DIR = os.environ["ROOT_DIR"]
55
EMSCRIPTEN_ROOT = os.environ["EMSCRIPTEN"]
6-
76
LLVM_ROOT = ROOT_DIR + "/external/emscripten/bin"
8-
EMSCRIPTEN_NATIVE_OPTIMIZER = LLVM_ROOT + "/optimizer"
7+
BINARYEN_ROOT = ROOT_DIR + "/external/emscripten"
8+
FROZEN_CACHE = True
99

1010
system = platform.system()
1111
nodejs_binary = "node.exe" if(system =="Windows") else "bin/node"
1212
NODE_JS = ROOT_DIR + "/external/nodejs_{}_amd64/{}".format(system.lower(), nodejs_binary)
13-
BINARYEN_ROOT = ROOT_DIR + "/external/emscripten"

‎.emsdk-cache/emsdk-master/bazel/emscripten_toolchain/env.sh‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,4 @@
22

33
export ROOT_DIR=`(pwd -P)`
44
export EMSCRIPTEN=${ROOT_DIR}/external/emscripten/emscripten
5-
65
export EM_CONFIG=${ROOT_DIR}/emscripten_toolchain/emscripten_config
7-
export EM_CACHE=${ROOT_DIR}/emscripten_toolchain/cache

‎.emsdk-cache/emsdk-master/bazel/hello-world/BUILD‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,18 @@ cc_binary(
66
srcs = ["hello-world.cc"],
77
)
88

9+
cc_binary(
10+
name = "hello-world-simd",
11+
srcs = ["hello-world-simd.cc"],
12+
)
13+
914
wasm_cc_binary(
1015
name = "hello-world-wasm",
1116
cc_target = ":hello-world",
1217
)
18+
19+
wasm_cc_binary(
20+
name = "hello-world-wasm-simd",
21+
cc_target = ":hello-world-simd",
22+
simd = True,
23+
)

‎.emsdk-cache/emsdk-master/docker/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@ COPY --from=stage_build /emsdk /emsdk
6666
# (sub-stages) or with custom / no entrypoint
6767
ENV EMSDK=/emsdk \
6868
EM_CONFIG=/emsdk/.emscripten \
69-
EMSDK_NODE=/emsdk/node/12.18.1_64bit/bin/node \
70-
PATH="/emsdk:/emsdk/upstream/emscripten:/emsdk/upstream/bin:/emsdk/node/12.18.1_64bit/bin:${PATH}"
69+
EMSDK_NODE=/emsdk/node/14.15.5_64bit/bin/node \
70+
PATH="/emsdk:/emsdk/upstream/emscripten:/emsdk/upstream/bin:/emsdk/node/14.15.5_64bit/bin:${PATH}"
7171

7272
# ------------------------------------------------------------------------------
7373
# Create a 'standard` 1000:1000 user

‎.emsdk-cache/emsdk-master/emscripten-releases-tags.txt‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
{
2-
"latest": "2.0.12",
2+
"latest": "2.0.14",
33
"releases": {
4+
"2.0.14": "fc5562126762ab26c4757147a3b4c24e85a7289e",
5+
"2.0.13": "ce0e4a4d1cab395ee5082a60ebb4f3891a94b256",
46
"2.0.12": "dcf819a7821f8db0c8f15ac336fea8960ec204f5",
57
"2.0.11": "4764c5c323a474f7ba28ae991b0c9024fccca43c",
68
"2.0.10": "37fc7647c754ac9a28ad588c143b82286de0ef71",

0 commit comments

Comments
 (0)