Skip to content

Commit

Permalink
Build shared LLVM on Windows if requested
Browse files Browse the repository at this point in the history
  • Loading branch information
@ihnorton
ihnorton committed Apr 2, 2015
1 parent 8e32963 commit fc3df96
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion deps/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,11 @@ ifeq ($(USE_LIBCPP), 1)
LLVM_FLAGS += --enable-libcpp
endif # USE_LIBCPP
ifeq ($(OS), WINNT)
LLVM_FLAGS += --with-extra-ld-options="-Wl,--stack,8388608" LDFLAGS="" --disable-shared
LLVM_FLAGS += --with-extra-ld-options="-Wl,--stack,8388608" LDFLAGS=""
# turn off shared LLVM on Windows unless explicitly requested
ifneq ($(USE_LLVM_SHLIB),1)
LLVM_FLAGS += --disable-shared
endif
LLVM_CPPFLAGS += -D__USING_SJLJ_EXCEPTIONS__ -D__CRT__NO_INLINE
endif # OS == WINNT
ifeq ($(USE_INTEL_JITEVENTS), 1)
Expand Down

2 comments on commit fc3df96

@vtjnash
Copy link
Member

@vtjnash vtjnash commented on fc3df96 Apr 2, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This used to cause llvm build/link errors on Win64. I guess this commit means it works now for some versions of llvm?

@ihnorton
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, with a patch: http://reviews.llvm.org/D5036. It came up when trying to build for Cxx.jl on Windows. I committed this because it is annoying to have a hard-coded option that ignores an override.

I guess we should add a note about the patch, or carry the patch.

Please sign in to comment.