Skip to content

Commit

Permalink
Use delayed expansion in CXXLD to fix JuliaLang#13337
Browse files Browse the repository at this point in the history
generation of libjulia.dll.a on Windows
  • Loading branch information
tkelman committed Oct 10, 2015
1 parent ba135b2 commit caab310
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -135,12 +135,12 @@ $(BUILDDIR)/julia_version.h: $(JULIAHOME)/VERSION
mv $@.$(JULIA_BUILD_MODE).tmp $@

ifneq ($(USEMSVC), 1)
CXXLD := $(CXX) -shared
CXXLD = $(CXX) -shared
ifeq ($(OS),WINNT)
CXXLD += -Wl,--out-implib,$(build_libdir)/$(notdir $@).a
endif
else
CXXLD := $(LD) -dll -export:jl_setjmp -export:jl_longjmp
CXXLD = $(LD) -dll -export:jl_setjmp -export:jl_longjmp
endif

$(build_shlibdir)/libjulia-debug.$(SHLIB_EXT): $(SRCDIR)/julia.expmap $(DOBJS) $(BUILDDIR)/flisp/libflisp-debug.a $(BUILDDIR)/support/libsupport-debug.a $(LIBUV)
Expand Down

0 comments on commit caab310

Please sign in to comment.