diff options
| author | Ben Langmuir <blangmuir@apple.com> | 2014-04-17 00:52:48 +0000 |
|---|---|---|
| committer | Ben Langmuir <blangmuir@apple.com> | 2014-04-17 00:52:48 +0000 |
| commit | 47d1ca4838fac9a1efd23dfba58a17492ae2f174 (patch) | |
| tree | 99ac4e9536f7a81609389328e45e7862d6a0ff2e | |
| parent | 2c92e9cb53b8a0da29fe0392d6a1f324aae36116 (diff) | |
| download | bcm5719-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
| -rw-r--r-- | clang/docs/Modules.rst | 2 | ||||
| -rw-r--r-- | clang/lib/Headers/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | clang/lib/Headers/Makefile | 8 | ||||
| -rw-r--r-- | clang/lib/Headers/module.modulemap (renamed from clang/lib/Headers/module.map) | 0 |
4 files changed, 6 insertions, 6 deletions
diff --git a/clang/docs/Modules.rst b/clang/docs/Modules.rst index eec0b774cf6..183a8f208f6 100644 --- a/clang/docs/Modules.rst +++ b/clang/docs/Modules.rst @@ -839,7 +839,7 @@ Where To Learn More About Modules ================================= The Clang source code provides additional information about modules: -``clang/lib/Headers/module.map`` +``clang/lib/Headers/module.modulemap`` Module map for Clang's compiler-specific header files. ``clang/test/Modules/`` 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 |
