From 5722529ac376012f845b8d12cfabff361148c5f4 Mon Sep 17 00:00:00 2001 From: Tony Kelman Date: Mon, 17 Oct 2016 22:26:23 -0700 Subject: [PATCH] Create build_includedir before installing osxunwind (#18976) 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 --- Makefile | 2 +- deps/unwind.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 158c5f1e95725..d123f28e8f314 100644 --- a/Makefile +++ b/Makefile @@ -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)) diff --git a/deps/unwind.mk b/deps/unwind.mk index df5cf5203860f..397fae31a3590 100644 --- a/deps/unwind.mk +++ b/deps/unwind.mk @@ -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)