Skip to content

Commit

Permalink
Install libopenlibm.dll.a in windows. Bump openlibm to v0.5.4. (Julia…
Browse files Browse the repository at this point in the history
  • Loading branch information
twadleigh authored and tkelman committed Aug 29, 2016
1 parent 4d6ceac commit 9ebf5d6
Show file tree
Hide file tree
Showing 7 changed files with 6 additions and 5 deletions.
1 change: 1 addition & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -338,6 +338,7 @@ ifeq ($(OS),WINNT)
-$(INSTALL_M) $(build_bindir)/*.dll $(DESTDIR)$(bindir)/
-$(INSTALL_M) $(build_libdir)/libjulia.dll.a $(DESTDIR)$(libdir)/
-$(INSTALL_M) $(build_libdir)/libjulia-debug.dll.a $(DESTDIR)$(libdir)/
-$(INSTALL_M) $(build_bindir)/libopenlibm.dll.a $(DESTDIR)$(libdir)/
else
-cp -a $(build_libexecdir) $(DESTDIR)$(prefix)

Expand Down
2 changes: 1 addition & 1 deletion contrib/julia-config.jl
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ function ldlibs()
if is_unix()
return replace("""-Wl,-rpath,$(libDir()) -ljulia""","\\","\\\\")
else
return replace("""-ljulia""","\\","\\\\")
return "-ljulia -lopenlibm"
end
end

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
46654ecc67adba1d86426b1d9dfa3bc9
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
64bb73800f3ff9219d7094b9f5f224468ee4cb34136bef77e1ae8b849e18d5f5fc1001f2e8dd92bcf0018f78152c3b52b9284e431bbafcea21d4f594c05e19ad

This file was deleted.

This file was deleted.

4 changes: 2 additions & 2 deletions deps/openlibm.version
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
OPENLIBM_BRANCH=v0.5.3
OPENLIBM_SHA1=71e79eb6f74d3f04ce724195b8ef5846a70d281e
OPENLIBM_BRANCH=v0.5.4
OPENLIBM_SHA1=1581174c85f7b645b15ba1ac1c3a98fb601f0fe7

0 comments on commit 9ebf5d6

Please sign in to comment.