makefile fixes to build on darwin

JuliaLang · Sep 2, 2015 · 236c5e4 · 236c5e4
1 parent ac027dc
commit 236c5e4
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/Make.user b/Make.user
@@ -1,4 +1,4 @@
-CFLAGS = -ftls-model=global-dynamic
+JCPPFLAGS = -ftls-model=global-dynamic
 LLVM_VER = svn
 LLVM_GIT_URL_LLVM = https://github.com/JuliaLang/llvm.git -b kf/tlsrebase5
 

diff --git a/src/julia.h b/src/julia.h
@@ -62,7 +62,7 @@ extern "C" {
 // WARNING: Threading support is incomplete.  Changing the 1 to a 0 will break Julia.
 // Nonetheless, we define JL_THREAD and use it to give advanced notice to maintainers
 // of what eventual threading support will change.
-#if 1
+#if 0
 // Definition for compiling non-thread-safe Julia.
 #  define JL_THREAD
 #elif !defined(_OS_WINDOWS_)

diff --git a/src/options.h b/src/options.h
@@ -18,11 +18,8 @@
 
 // codegen options ------------------------------------------------------------
 
-// (Experimental) codegen support for thread-local storage
-// #define CODEGEN_TLS
-
 // (Experimental) Use MCJIT ELF, even where it's not the native format
-// #define FORCE_ELF
+#define FORCE_ELF
 
 // with KEEP_BODIES, we keep LLVM function bodies around for later debugging
 // #define KEEP_BODIES