Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
matrix-org
Olm
Commits
6a63a5bf
Commit
6a63a5bf
authored
Sep 14, 2021
by
Hubert Chathi
Browse files
use full path to externs.js because it's failing to find it
parent
e1aa1b32
Pipeline
#11022
passed with stages
in 2 minutes and 33 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Makefile
View file @
6a63a5bf
...
...
@@ -223,7 +223,7 @@ javascript/olm_prefix.js: javascript/olm_prefix.js.in Makefile common.mk
# wasm file baked into the js, hence messing around outputting to olm.js
# and then renaming it.
$(JS_WASM_TARGET)
:
$(JS_OBJECTS) $(JS_PRE) $(JS_POST) $(JS_EXPORTED_FUNCTIONS) $(JS_PREFIX) $(JS_SUFFIX)
EMCC_CLOSURE_ARGS
=
"--externs
$(JS_EXTERNS)
"
$(EMCC_LINK)
\
EMCC_CLOSURE_ARGS
=
"--externs
$(CURDIR)
/
$(JS_EXTERNS)
"
$(EMCC_LINK)
\
$(EMCCFLAGS_WASM)
\
$(
foreach
f,
$(JS_PRE)
,--pre-js
$(f)
)
\
$(
foreach
f,
$(JS_POST)
,--post-js
$(f)
)
\
...
...
@@ -234,7 +234,7 @@ $(JS_WASM_TARGET): $(JS_OBJECTS) $(JS_PRE) $(JS_POST) $(JS_EXPORTED_FUNCTIONS) $
-o
$@
$(JS_OBJECTS)
$(JS_ASMJS_TARGET)
:
$(JS_OBJECTS) $(JS_PRE) $(JS_POST) $(JS_EXPORTED_FUNCTIONS) $(JS_PREFIX) $(JS_SUFFIX)
EMCC_CLOSURE_ARGS
=
"--externs
$(JS_EXTERNS)
"
$(EMCC_LINK)
\
EMCC_CLOSURE_ARGS
=
"--externs
$(CURDIR)
/
$(JS_EXTERNS)
"
$(EMCC_LINK)
\
$(EMCCFLAGS_ASMJS)
\
$(
foreach
f,
$(JS_PRE)
,--pre-js
$(f)
)
\
$(
foreach
f,
$(JS_POST)
,--post-js
$(f)
)
\
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment