summaryrefslogtreecommitdiffstats
path: root/clang/lib
diff options
context:
space:
mode:
authorBen Langmuir <blangmuir@apple.com>2014-04-17 00:52:48 +0000
committerBen Langmuir <blangmuir@apple.com>2014-04-17 00:52:48 +0000
commit47d1ca4838fac9a1efd23dfba58a17492ae2f174 (patch)
tree99ac4e9536f7a81609389328e45e7862d6a0ff2e /clang/lib
parent2c92e9cb53b8a0da29fe0392d6a1f324aae36116 (diff)
downloadbcm5719-llvm-47d1ca4838fac9a1efd23dfba58a17492ae2f174.tar.gz
bcm5719-llvm-47d1ca4838fac9a1efd23dfba58a17492ae2f174.zip
Rename lib/Headers/module.map to module.modulemap
Don't install a file using the legacy spelling. llvm-svn: 206431
Diffstat (limited to 'clang/lib')
-rw-r--r--clang/lib/Headers/CMakeLists.txt2
-rw-r--r--clang/lib/Headers/Makefile8
-rw-r--r--clang/lib/Headers/module.modulemap (renamed from clang/lib/Headers/module.map)0
3 files changed, 5 insertions, 5 deletions
diff --git a/clang/lib/Headers/CMakeLists.txt b/clang/lib/Headers/CMakeLists.txt
index d0c26848a3a..23b2446cffe 100644
--- a/clang/lib/Headers/CMakeLists.txt
+++ b/clang/lib/Headers/CMakeLists.txt
@@ -45,7 +45,7 @@ set(files
xopintrin.h
cpuid.h
unwind.h
- module.map
+ module.modulemap
)
set(output_dir ${LLVM_LIBRARY_OUTPUT_INTDIR}/clang/${CLANG_VERSION}/include)
diff --git a/clang/lib/Headers/Makefile b/clang/lib/Headers/Makefile
index 42219c4082b..903acacc8ac 100644
--- a/clang/lib/Headers/Makefile
+++ b/clang/lib/Headers/Makefile
@@ -32,13 +32,13 @@ $(HeaderDir)/arm_neon.h: $(BUILT_SOURCES) $(HeaderDir)/.dir
$(Verb) cp $< $@
$(Echo) Copying $(notdir $<) to build dir
-$(HeaderDir)/module.map: $(PROJ_SRC_DIR)/module.map $(HeaderDir)/.dir
+$(HeaderDir)/module.modulemap: $(PROJ_SRC_DIR)/module.modulemap $(HeaderDir)/.dir
$(Verb) cp $< $@
$(Echo) Copying $(notdir $<) to build dir
# Hook into the standard Makefile rules.
-all-local:: $(OBJHEADERS) $(HeaderDir)/module.map
+all-local:: $(OBJHEADERS) $(HeaderDir)/module.modulemap
PROJ_headers := $(DESTDIR)$(PROJ_prefix)/lib/clang/$(CLANG_VERSION)/include
@@ -52,12 +52,12 @@ $(INSTHEADERS): $(PROJ_headers)/%.h: $(HeaderDir)/%.h | $(PROJ_headers)
$(Verb) $(DataInstall) $< $(PROJ_headers)
$(Echo) Installing compiler include file: $(notdir $<)
-$(PROJ_headers)/module.map: $(HeaderDir)/module.map | $(PROJ_headers)
+$(PROJ_headers)/module.modulemap: $(HeaderDir)/module.modulemap | $(PROJ_headers)
$(Verb) $(DataInstall) $< $(PROJ_headers)
$(Echo) Installing compiler module map file: $(notdir $<)
-install-local:: $(INSTHEADERS) $(PROJ_headers)/module.map
+install-local:: $(INSTHEADERS) $(PROJ_headers)/module.modulemap
$(ObjDir)/arm_neon.h.inc.tmp : $(CLANG_LEVEL)/include/clang/Basic/arm_neon.td $(CLANG_TBLGEN) $(ObjDir)/.dir
$(Echo) "Building Clang arm_neon.h.inc with tblgen"
diff --git a/clang/lib/Headers/module.map b/clang/lib/Headers/module.modulemap
index 9f7944dedbb..9f7944dedbb 100644
--- a/clang/lib/Headers/module.map
+++ b/clang/lib/Headers/module.modulemap
OpenPOWER on IntegriCloud