Skip to content

Commit

Permalink
Create build_includedir before installing osxunwind (#18976)
Browse files Browse the repository at this point in the history
might fix an error that's been happening on the mac buildbot
https://build.julialang.org/builders/package_osx10.9-x64/builds/903/steps/make/logs/stdio
  • Loading branch information
tkelman authored Oct 18, 2016
1 parent d3fb0f2 commit 5722529
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ default: $(JULIA_BUILD_MODE) # contains either "debug" or "release"
all: debug release

# sort is used to remove potential duplicates
DIRS := $(sort $(build_bindir) $(build_depsbindir) $(build_libdir) $(build_private_libdir) $(build_libexecdir) $(build_sysconfdir)/julia $(build_datarootdir)/julia $(build_man1dir))
DIRS := $(sort $(build_bindir) $(build_depsbindir) $(build_libdir) $(build_private_libdir) $(build_libexecdir) $(build_includedir) $(build_sysconfdir)/julia $(build_datarootdir)/julia $(build_man1dir))
ifneq ($(BUILDROOT),$(JULIAHOME))
BUILDDIRS := $(BUILDROOT) $(addprefix $(BUILDROOT)/,base src ui doc deps test test/perf)
BUILDDIRMAKE := $(addsuffix /Makefile,$(BUILDDIRS))
Expand Down
2 changes: 1 addition & 1 deletion deps/unwind.mk
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ $(BUILDDIR)/libosxunwind-$(OSXUNWIND_VER)/build-compiled: $(BUILDDIR)/libosxunwi
$(MAKE) -C $(dir $<) $(OSXUNWIND_FLAGS)
echo 1 > $@

$(build_prefix)/manifest/osxunwind: $(BUILDDIR)/libosxunwind-$(OSXUNWIND_VER)/build-compiled | $(build_shlibdir) $(build_prefix)/manifest
$(build_prefix)/manifest/osxunwind: $(BUILDDIR)/libosxunwind-$(OSXUNWIND_VER)/build-compiled | $(build_libdir) $(build_shlibdir) $(build_includedir) $(build_prefix)/manifest
cp $(dir $<)/libosxunwind.a $(build_libdir)/libosxunwind.a
cp $(dir $<)/libosxunwind.$(SHLIB_EXT) $(build_shlibdir)/libosxunwind.$(SHLIB_EXT)
cp -R $(dir $<)/include/* $(build_includedir)
Expand Down

0 comments on commit 5722529

Please sign in to comment.