diff options
| author | Hubert Chathi <hubert@uhoreg.ca> | 2019-09-30 13:12:38 +0000 |
|---|---|---|
| committer | Hubert Chathi <hubert@uhoreg.ca> | 2019-09-30 13:12:38 +0000 |
| commit | 3568060570bb06eff022f49ab39cf34e387e382f (patch) | |
| tree | 181651d705277251cfd05453f297ae7bdacc2631 | |
| parent | 44c2e47a3ec72d034441fa5b1663131e15aa0dc5 (diff) | |
| parent | 72df5301e05839148c1bebe085ee693f5fe0ad9b (diff) | |
Merge branch 'dbkr/emscripten_is_picky_about_pic' into 'master'
Build the js objects without PIC
See merge request matrix-org/olm!8
| -rw-r--r-- | Makefile | 15 |
1 files changed, 9 insertions, 6 deletions
@@ -81,10 +81,13 @@ CPPFLAGS += -Iinclude -Ilib \ -DOLMLIB_VERSION_PATCH=$(PATCH) # we rely on <stdint.h>, which was introduced in C99 -CFLAGS += -Wall -Werror -std=c99 -fPIC -CXXFLAGS += -Wall -Werror -std=c++11 -fPIC +CFLAGS += -Wall -Werror -std=c99 +CXXFLAGS += -Wall -Werror -std=c++11 LDFLAGS += -Wall -Werror +CFLAGS_NATIVE = -fPIC +CXXFLAGS_NATIVE = -fPIC + EMCCFLAGS = --closure 1 --memory-init-file 0 -s NO_FILESYSTEM=1 -s INVOKE_RUN=0 -s MODULARIZE=1 # Olm generally doesn't need a lot of memory to encrypt / decrypt its usual @@ -113,12 +116,12 @@ CPPFLAGS += -MMD ### per-target variables -$(RELEASE_OBJECTS): CFLAGS += $(RELEASE_OPTIMIZE_FLAGS) -$(RELEASE_OBJECTS): CXXFLAGS += $(RELEASE_OPTIMIZE_FLAGS) +$(RELEASE_OBJECTS): CFLAGS += $(RELEASE_OPTIMIZE_FLAGS) $(CFLAGS_NATIVE) +$(RELEASE_OBJECTS): CXXFLAGS += $(RELEASE_OPTIMIZE_FLAGS) $(CXXFLAGS_NATIVE) $(RELEASE_TARGET): LDFLAGS += $(RELEASE_OPTIMIZE_FLAGS) -$(DEBUG_OBJECTS): CFLAGS += $(DEBUG_OPTIMIZE_FLAGS) -$(DEBUG_OBJECTS): CXXFLAGS += $(DEBUG_OPTIMIZE_FLAGS) +$(DEBUG_OBJECTS): CFLAGS += $(DEBUG_OPTIMIZE_FLAGS) $(CFLAGS_NATIVE) +$(DEBUG_OBJECTS): CXXFLAGS += $(DEBUG_OPTIMIZE_FLAGS) $(CXXFLAGS_NATIVE) $(DEBUG_TARGET): LDFLAGS += $(DEBUG_OPTIMIZE_FLAGS) $(TEST_BINARIES): CPPFLAGS += -Itests/include |