Skip to content

Commit d807b70

Browse files
authored
Add llvm-config --cflags to CFLAGS (#59419)
It's convenient to use `USE_SYSTEM_LLVM=1` and `LLVM_CONFIG` to build Julia with a local LLVM build, but the build fails because `<llvm/Config/llvm-config.h>` is not found when it is not installed into `build_includedir`. Ask `llvm-config` for the `CFLAGS` to fix this.
1 parent 3d3814d commit d807b70

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

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)

0 commit comments

Comments
 (0)