Merge pull request JuliaLang#32415 from JuliaLang/kf/wasmbuildmisc

Two small build fixes under Emscripten
halleysfifthinc · Jul 1, 2019 · 98168bc · 98168bc
2 parents 00d8694 + 4671644
commit 98168bc
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/deps/llvm.mk b/deps/llvm.mk
@@ -138,6 +138,10 @@ LLVM_CPPFLAGS += -flto
 LLVM_LDFLAGS += -flto
 endif # LLVM_LTO
 
+ifeq ($(fPIC),)
+LLVM_CMAKE += -DLLVM_ENABLE_PIC=OFF
+endif
+
 ifeq ($(BUILD_CUSTOM_LIBCXX),1)
 LLVM_LDFLAGS += -Wl,-rpath,$(build_libdir)
 LLVM_CPPFLAGS += -I$(build_includedir)

diff --git a/src/flisp/Makefile b/src/flisp/Makefile
@@ -33,7 +33,10 @@ FLAGS := -I$(LLTDIR) $(JCFLAGS) $(HFILEDIRS:%=-I%) \
  -I$(LIBUV_INC) -I$(UTF8PROC_INC) -I$(build_includedir) $(LIBDIRS:%=-L%) \
  -DLIBRARY_EXPORTS -DUTF8PROC_EXPORTS
 ifneq ($(USEMSVC), 1)
-FLAGS += -Wall -Wno-strict-aliasing -DUSE_COMPUTED_GOTO -fvisibility=hidden -Wpointer-arith -Wundef
+ifneq ($(OS), emscripten)
+FLAGS += -DUSE_COMPUTED_GOTO
+endif
+FLAGS += -Wall -Wno-strict-aliasing -fvisibility=hidden -Wpointer-arith -Wundef
 FLAGS += -Wold-style-definition -Wstrict-prototypes -Wc++-compat
 endif
 

diff --git a/src/gc.c b/src/gc.c
@@ -1856,7 +1856,7 @@ STATIC_INLINE int gc_mark_scan_obj32(jl_ptls_t ptls, jl_gc_mark_sp_t *sp, gc_mar
  return 0;
 }
 
-#ifdef __GNUC__
+#if defined(__GNUC__) && !defined(__OS_EMSCRIPTEN__)
 # define gc_mark_laddr(name) (&&name)
 # define gc_mark_jmp(ptr) goto *(ptr)
 #else