summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDylan Noblesmith <nobled@dreamwidth.org>2012-02-01 22:23:31 +0000
committerDylan Noblesmith <nobled@dreamwidth.org>2012-02-01 22:23:31 +0000
commit27b37ab9b102c0ef95592eea47e2f54a2a8bf780 (patch)
treea2045ccffc0049a7510bceaf3017d72c0ab693e8
parent5b7ba952947646ce959187e017bda74ba380af6c (diff)
downloadbcm5719-llvm-27b37ab9b102c0ef95592eea47e2f54a2a8bf780.tar.gz
bcm5719-llvm-27b37ab9b102c0ef95592eea47e2f54a2a8bf780.zip
make: fix installation of generated header files
The PROJ_SRC_DIR != PROJ_OBJ_DIR path was missing the directory creation logic that was in the path for non-generated headers. PR11903. (The oversight was copied and pasted from LLVM's Makefile.rules, where it apparently existed since time immemorial til it was corrected in r127325.) llvm-svn: 149551
-rw-r--r--clang/include/clang-c/Makefile5
-rw-r--r--clang/include/clang/Makefile5
2 files changed, 10 insertions, 0 deletions
diff --git a/clang/include/clang-c/Makefile b/clang/include/clang-c/Makefile
index 81f5f41b176..b29e29ea1ef 100644
--- a/clang/include/clang-c/Makefile
+++ b/clang/include/clang-c/Makefile
@@ -27,6 +27,11 @@ ifneq ($(PROJ_SRC_ROOT),$(PROJ_OBJ_ROOT))
cd $(PROJ_OBJ_ROOT)/tools/clang/include && \
for hdr in `find clang-c -type f '!' '(' -name 'Makefile' ')' -print \
| grep -v CVS | grep -v .tmp | grep -v .dir` ; do \
+ instdir=`dirname "$(IntIncludeDir)/$$hdr"` ; \
+ if test \! -d "$$instdir" ; then \
+ $(EchoCmd) Making install directory $$instdir ; \
+ $(MKDIR) $$instdir ;\
+ fi ; \
$(DataInstall) $$hdr $(IntIncludeDir)/$$hdr ; \
done ; \
fi
diff --git a/clang/include/clang/Makefile b/clang/include/clang/Makefile
index 4398f3aed57..5f2077d2f04 100644
--- a/clang/include/clang/Makefile
+++ b/clang/include/clang/Makefile
@@ -33,6 +33,11 @@ ifneq ($(PROJ_SRC_ROOT),$(PROJ_OBJ_ROOT))
-o -name '*.inc' \
')' -print \
| grep -v CVS | grep -v .tmp | grep -v .dir` ; do \
+ instdir=$(DESTDIR)`dirname "$(PROJ_includedir)/$$hdr"` ; \
+ if test \! -d "$$instdir" ; then \
+ $(EchoCmd) Making install directory $$instdir ; \
+ $(MKDIR) $$instdir ;\
+ fi ; \
$(DataInstall) $$hdr $(DESTDIR)$(PROJ_includedir)/$$hdr ; \
done ; \
fi
OpenPOWER on IntegriCloud