index : olm

My fork of libolm

diff options
context:
space:
mode:
authorHubert Chathi <[email protected]>2020-05-19 15:09:15 -0400
committerHubert Chathi <[email protected]>2020-05-19 15:10:24 -0400
commitefd17631b16d1271a029e0af8f7d8e5ae795cc5d (patch)
treee5ab6e5ad6f9f0bb809d1ca0b8510b7aec9b9731
parentad173bc798c039bd4e855a25b99f15193bdb04c4 (diff)
downloadolm-efd17631b16d1271a029e0af8f7d8e5ae795cc5d.tar.gz
move -o option before source files, for better compatibility with LLVM
-rw-r--r--Makefile16
-rw-r--r--python/Makefile6
2 files changed, 11 insertions, 11 deletions
diff --git a/Makefile b/Makefile
index 04ec18c..6570cc1 100644
--- a/Makefile
+++ b/Makefile
@@ -201,7 +201,7 @@ $(JS_WASM_TARGET): $(JS_OBJECTS) $(JS_PRE) $(JS_POST) $(JS_EXPORTED_FUNCTIONS) $
$(foreach f,$(JS_POST),--post-js $(f)) \
-s "[email protected]$(JS_EXPORTED_FUNCTIONS)" \
-s "EXTRA_EXPORTED_RUNTIME_METHODS=$(JS_EXTRA_EXPORTED_RUNTIME_METHODS)" \
- $(JS_OBJECTS) -o [email protected]
+ -o [email protected] $(JS_OBJECTS)
mv [email protected] javascript/olmtmp.js
cat $(JS_PREFIX) javascript/olmtmp.js $(JS_SUFFIX) > [email protected]
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 "[email protected]$(JS_EXPORTED_FUNCTIONS)" \
-s "EXTRA_EXPORTED_RUNTIME_METHODS=$(JS_EXTRA_EXPORTED_RUNTIME_METHODS)" \
- $(JS_OBJECTS) -o [email protected]
+ -o [email protected] $(JS_OBJECTS)
mv [email protected] javascript/olmtmp.js
cat $(JS_PREFIX) javascript/olmtmp.js $(JS_SUFFIX) > [email protected]
rm javascript/olmtmp.js
@@ -297,11 +297,11 @@ $(BUILD_DIR)/wasm/%.o: %.cpp
$(BUILD_DIR)/tests/%: tests/%.c $(DEBUG_OBJECTS)
$(call mkdir,$(dir [email protected]))
- $(LINK.c) $< $(DEBUG_OBJECTS) $(LOADLIBES) $(LDLIBS) -o [email protected]
+ $(LINK.c) -o [email protected] $< $(DEBUG_OBJECTS) $(LOADLIBES) $(LDLIBS)
$(BUILD_DIR)/tests/%: tests/%.cpp $(DEBUG_OBJECTS)
$(call mkdir,$(dir [email protected]))
- $(LINK.cc) $< $(DEBUG_OBJECTS) $(LOADLIBES) $(LDLIBS) -o [email protected]
+ $(LINK.cc) -o [email protected] $< $(DEBUG_OBJECTS) $(LOADLIBES) $(LDLIBS)
$(BUILD_DIR)/fuzzers/objects/%.o: %.c
$(call mkdir,$(dir [email protected]))
@@ -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 [email protected]
+ $(AFL_LINK.c) -o [email protected] $< $(FUZZER_OBJECTS) $(LOADLIBES) $(LDLIBS)
$(BUILD_DIR)/fuzzers/fuzz_%: fuzzers/fuzz_%.cpp $(FUZZER_OBJECTS)
- $(AFL_LINK.cc) $< $(FUZZER_OBJECTS) $(LOADLIBES) $(LDLIBS) -o [email protected]
+ $(AFL_LINK.cc) -o [email protected] $< $(FUZZER_OBJECTS) $(LOADLIBES) $(LDLIBS)
$(BUILD_DIR)/fuzzers/debug_%: fuzzers/fuzz_%.c $(DEBUG_OBJECTS)
- $(LINK.c) $< $(DEBUG_OBJECTS) $(LOADLIBES) $(LDLIBS) -o [email protected]
+ $(LINK.c) -o [email protected] $< $(DEBUG_OBJECTS) $(LOADLIBES) $(LDLIBS)
$(BUILD_DIR)/fuzzers/debug_%: fuzzers/fuzz_%.cpp $(DEBUG_OBJECTS)
- $(LINK.cc) $< $(DEBUG_OBJECTS) $(LOADLIBES) $(LDLIBS) -o [email protected]
+ $(LINK.cc) -o [email protected] $< $(DEBUG_OBJECTS) $(LOADLIBES) $(LDLIBS)
%.html: %.rst
rst2html $< [email protected]
diff --git a/python/Makefile b/python/Makefile
index 16f9823..6bba9cd 100644
--- a/python/Makefile
+++ b/python/Makefile
@@ -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