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
efd17631
Commit
efd17631
authored
May 19, 2020
by
Hubert Chathi
Browse files
move -o option before source files, for better compatibility with LLVM
parent
ad173bc7
Changes
2
Show whitespace changes
Inline
Side-by-side
Makefile
View file @
efd17631
...
...
@@ -201,7 +201,7 @@ $(JS_WASM_TARGET): $(JS_OBJECTS) $(JS_PRE) $(JS_POST) $(JS_EXPORTED_FUNCTIONS) $
$(
foreach
f,
$(JS_POST)
,--post-js
$(f)
)
\
-s
"EXPORTED_FUNCTIONS=@
$(JS_EXPORTED_FUNCTIONS)
"
\
-s
"EXTRA_EXPORTED_RUNTIME_METHODS=
$(JS_EXTRA_EXPORTED_RUNTIME_METHODS)
"
\
$(JS_OBJECTS)
-o
$@
-o
$@
$(JS_OBJECTS)
mv
$@
javascript/olmtmp.js
cat
$(JS_PREFIX)
javascript/olmtmp.js
$(JS_SUFFIX)
>
$@
rm
javascript/olmtmp.js
...
...
@@ -213,7 +213,7 @@ $(JS_ASMJS_TARGET): $(JS_OBJECTS) $(JS_PRE) $(JS_POST) $(JS_EXPORTED_FUNCTIONS)
$(
foreach
f,
$(JS_POST)
,--post-js
$(f)
)
\
-s
"EXPORTED_FUNCTIONS=@
$(JS_EXPORTED_FUNCTIONS)
"
\
-s
"EXTRA_EXPORTED_RUNTIME_METHODS=
$(JS_EXTRA_EXPORTED_RUNTIME_METHODS)
"
\
$(JS_OBJECTS)
-o
$@
-o
$@
$(JS_OBJECTS)
mv
$@
javascript/olmtmp.js
cat
$(JS_PREFIX)
javascript/olmtmp.js
$(JS_SUFFIX)
>
$@
rm
javascript/olmtmp.js
...
...
@@ -297,11 +297,11 @@ $(BUILD_DIR)/wasm/%.o: %.cpp
$(BUILD_DIR)/tests/%
:
tests/%.c $(DEBUG_OBJECTS)
$(
call
mkdir
,
$(
dir
$@
))
$(LINK.c)
$<
$(DEBUG_OBJECTS)
$(LOADLIBES)
$(LDLIBS)
-o
$@
$(LINK.c)
-o
$@
$<
$(DEBUG_OBJECTS)
$(LOADLIBES)
$(LDLIBS)
$(BUILD_DIR)/tests/%
:
tests/%.cpp $(DEBUG_OBJECTS)
$(
call
mkdir
,
$(
dir
$@
))
$(LINK.cc)
$<
$(DEBUG_OBJECTS)
$(LOADLIBES)
$(LDLIBS)
-o
$@
$(LINK.cc)
-o
$@
$<
$(DEBUG_OBJECTS)
$(LOADLIBES)
$(LDLIBS)
$(BUILD_DIR)/fuzzers/objects/%.o
:
%.c
$(
call
mkdir
,
$(
dir
$@
))
...
...
@@ -312,16 +312,16 @@ $(BUILD_DIR)/fuzzers/objects/%.o: %.cpp
$(AFL.cc)
$(OUTPUT_OPTION)
$<
$(BUILD_DIR)/fuzzers/fuzz_%
:
fuzzers/fuzz_%.c $(FUZZER_OBJECTS)
$(AFL_LINK.c)
$<
$(FUZZER_OBJECTS)
$(LOADLIBES)
$(LDLIBS)
-o
$@
$(AFL_LINK.c)
-o
$@
$<
$(FUZZER_OBJECTS)
$(LOADLIBES)
$(LDLIBS)
$(BUILD_DIR)/fuzzers/fuzz_%
:
fuzzers/fuzz_%.cpp $(FUZZER_OBJECTS)
$(AFL_LINK.cc)
$<
$(FUZZER_OBJECTS)
$(LOADLIBES)
$(LDLIBS)
-o
$@
$(AFL_LINK.cc)
-o
$@
$<
$(FUZZER_OBJECTS)
$(LOADLIBES)
$(LDLIBS)
$(BUILD_DIR)/fuzzers/debug_%
:
fuzzers/fuzz_%.c $(DEBUG_OBJECTS)
$(LINK.c)
$<
$(DEBUG_OBJECTS)
$(LOADLIBES)
$(LDLIBS)
-o
$@
$(LINK.c)
-o
$@
$<
$(DEBUG_OBJECTS)
$(LOADLIBES)
$(LDLIBS)
$(BUILD_DIR)/fuzzers/debug_%
:
fuzzers/fuzz_%.cpp $(DEBUG_OBJECTS)
$(LINK.cc)
$<
$(DEBUG_OBJECTS)
$(LOADLIBES)
$(LDLIBS)
-o
$@
$(LINK.cc)
-o
$@
$<
$(DEBUG_OBJECTS)
$(LOADLIBES)
$(LDLIBS)
%.html
:
%.rst
rst2html
$<
$@
...
...
python/Makefile
View file @
efd17631
...
...
@@ -5,15 +5,15 @@ OLM_HEADERS = ../include/olm/olm.h ../include/olm/inbound_group_session.h \
include/olm/olm.h
:
$(OLM_HEADERS)
mkdir
-p
include/olm
$(CPP)
-I
dummy
-I
../include
../
include/olm/olm.h
-o
include/olm/olm.h
$(CPP)
-I
dummy
-I
../include
-o
include/olm/olm.h
../
include/olm/olm.h
# add memset to the header so that we can use it to clear buffers
echo
'void *memset(void *s, int c, size_t n);'
>>
include/olm/olm.h
include/olm/pk.h
:
include/olm/olm.h ../include/olm/pk.h
$(CPP)
-I
dummy
-I
../include
../
include/olm/pk.h
-o
include/olm/pk.h
$(CPP)
-I
dummy
-I
../include
-o
include/olm/pk.h
../
include/olm/pk.h
include/olm/sas.h
:
include/olm/olm.h ../include/olm/sas.h
$(CPP)
-I
dummy
-I
../include
../
include/olm/sas.h
-o
include/olm/sas.h
$(CPP)
-I
dummy
-I
../include
-o
include/olm/sas.h
../
include/olm/sas.h
headers
:
include/olm/olm.h include/olm/pk.h include/olm/sas.h
...
...
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