Skip to content

Commit 8302694

Browse files
authored
Merge branch 'master' into size_AbstractArray
2 parents 94abb7f + d807b70 commit 8302694

File tree

6 files changed

+6
-5
lines changed

6 files changed

+6
-5
lines changed

deps/checksums/LinearAlgebra-6c92d28ca4de1944b892ae918bbaa9a9fb70a0b5.tar.gz/md5

Lines changed: 0 additions & 1 deletion
This file was deleted.

deps/checksums/LinearAlgebra-6c92d28ca4de1944b892ae918bbaa9a9fb70a0b5.tar.gz/sha512

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
9083c846d91595c48833471b57e4358b
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
1db12549ceb12f90a76ef6614b95a7fe8bb1fb82d5fc04a2c12ec54dcd8eb87d7226ea582fa5a4a752461e4fdda8e8281481ac707532cf4d7b0a9b16f0b0e5c8

src/Makefile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,7 @@ PUBLIC_HEADER_TARGETS := $(addprefix $(build_includedir)/julia/,$(notdir $(PUBLI
139139

140140
LLVM_LDFLAGS := $(shell $(LLVM_CONFIG_HOST) --ldflags)
141141
LLVM_CXXFLAGS := $(shell $(LLVM_CONFIG_HOST) --cxxflags)
142+
LLVM_CFLAGS := $(shell $(LLVM_CONFIG_HOST) --cflags)
142143

143144
ifeq ($(OS)_$(BINARY),WINNT_32)
144145
LLVM_CXXFLAGS += -I$(SRCDIR)/support/win32-clang-ABI-bug
@@ -284,9 +285,9 @@ $(BUILDDIR)/jl_internal_funcs.inc: $(SRCDIR)/jl_exported_funcs.inc
284285

285286
# source file rules
286287
$(BUILDDIR)/%.o: $(SRCDIR)/%.c $(HEADERS) | $(BUILDDIR)
287-
@$(call PRINT_CC, $(CC) $(JCPPFLAGS) $(JCFLAGS) $(JL_CFLAGS) $(SHIPFLAGS) $(DISABLE_ASSERTIONS) -c $< -o $@)
288+
@$(call PRINT_CC, $(CC) $(LLVM_CFLAGS) $(JCPPFLAGS) $(JCFLAGS) $(JL_CFLAGS) $(SHIPFLAGS) $(DISABLE_ASSERTIONS) -c $< -o $@)
288289
$(BUILDDIR)/%.dbg.obj: $(SRCDIR)/%.c $(HEADERS) | $(BUILDDIR)
289-
@$(call PRINT_CC, $(CC) $(JCPPFLAGS) $(JCFLAGS) $(JL_CFLAGS) $(DEBUGFLAGS) -c $< -o $@)
290+
@$(call PRINT_CC, $(CC) $(LLVM_CFLAGS) $(JCPPFLAGS) $(JCFLAGS) $(JL_CFLAGS) $(DEBUGFLAGS) -c $< -o $@)
290291
$(BUILDDIR)/%.o: $(SRCDIR)/%.cpp $(SRCDIR)/llvm-version.h $(HEADERS) $(LLVM_CONFIG_ABSOLUTE) | $(BUILDDIR)
291292
@$(call PRINT_CC, $(CXX) $(LLVM_CXXFLAGS) $(JCPPFLAGS) $(JCXXFLAGS) $(JL_CXXFLAGS) $(SHIPFLAGS) $(CXX_DISABLE_ASSERTION) -c $< -o $@)
292293
$(BUILDDIR)/%.dbg.obj: $(SRCDIR)/%.cpp $(SRCDIR)/llvm-version.h $(HEADERS) $(LLVM_CONFIG_ABSOLUTE) | $(BUILDDIR)

stdlib/LinearAlgebra.version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
LINEARALGEBRA_BRANCH = master
2-
LINEARALGEBRA_SHA1 = 6c92d28ca4de1944b892ae918bbaa9a9fb70a0b5
2+
LINEARALGEBRA_SHA1 = d5681068f1703644d7e5b5a6b7a9b9528d834bce
33
LINEARALGEBRA_GIT_URL := https://github.com/JuliaLang/LinearAlgebra.jl.git
44
LINEARALGEBRA_TAR_URL = https://api.github.com/repos/JuliaLang/LinearAlgebra.jl/tarball/$1

0 commit comments

Comments
 (0)