[Openmp-commits] [PATCH] D12331: Deprecating the Makefile+Perl build system

[Jonathan Peyton via Openmp-commits]

jlpeyton updated this revision to Diff 33201.
jlpeyton added a comment.

Updated the diff to address the website instructions.  I took a lot of the text from libcxx since it is a similar build process.


Repository:
  rL LLVM

http://reviews.llvm.org/D12331

Files:
  runtime/Makefile
  runtime/README.txt
  www/README.txt
  www/index.html

Index: www/index.html
===================================================================
--- www/index.html
+++ www/index.html
@@ -155,23 +155,35 @@
   <p>To check out the code, use:</p>
 
   <ul>
-  <li><code>svn co http://llvm.org/svn/llvm-project/openmp/trunk openmp</code></li>
+  <li><code>svn co http://llvm.org/svn/llvm-project/openmp/trunk libomp</code></li>
   </ul>
 
   <p>
-     Next:
+     Note that for an in-tree build, you should check out libomp to llvm/projects.
   </p>
-  
+
+  <p>In-tree build:</p>
+  <ul>
+    <li><code>cd where-you-want-to-live</code></li>
+    <li>Check out libomp into llvm/projects</li>
+    <li><code>cd where-you-want-to-build</code></li>
+    <li><code>mkdir build && cd build</code></li>
+    <li><code>cmake path/to/llvm -DCMAKE_C_COMPILER=<C compiler> -DCMAKE_CXX_COMPILER=<C++ compiler></code></li>
+    <li><code>make omp</code></li>
+  </ul>
+
+  <p>Out-of-tree build:</p>
   <ul>
-    <li><code>cd openmp/runtime</code></li>
-    <li><code>make compiler=gcc</code></li>
+    <li><code>cd where-you-want-to-live</code></li>
+    <li>Check out libomp</li>
+    <li><code>cd where-you-want-to-live/libomp/runtime</code></li>
+    <li><code>mkdir build && cd build</code></li>
+    <li><code>cmake -DCMAKE_C_COMPILER=<C compiler> -DCMAKE_CXX_COMPILER=<C++ compiler> ..</code></li>
+    <li><code>make</code></li>
   </ul>
   
   <p>Full details of how to build are in the
-    <a href="README.txt">README.txt</a>
-    which also describes a CMake based build system which may be more
-    convenient on some platforms and for porting to new platforms than
-    the make and Perl based system.
+    <a href="README.txt">README.txt</a> and Build_With_CMake.txt (inside the runtime/ subdirectory)
   </p>
 
   <!--=====================================================================-->
Index: www/README.txt
===================================================================
--- www/README.txt
+++ www/README.txt
@@ -34,8 +34,11 @@
 The runtime/Build_With_CMake.txt file has a description of how to
 build with Cmake.
 
-Building with the Makefile
+Building with the Makefile (deprecated)
 ==========================
+*** This build system is no longer being updated and should not be used
+*** to build libomp.  Please use the CMake build system.
+
 The Makefile at the top-level will attempt to detect what it needs to
 build the LLVM* OpenMP* Runtime Library.  To see the default settings, 
 type:
Index: runtime/README.txt
===================================================================
--- runtime/README.txt
+++ runtime/README.txt
@@ -34,8 +34,11 @@
 The runtime/Build_With_CMake.txt file has a description of how to
 build with Cmake.
 
-Building with the Makefile
+Building with the Makefile (deprecated)
 ==========================
+*** This build system is no longer being updated and should not be used
+*** to build libomp.  Please use the CMake build system.
+
 The Makefile at the top-level will attempt to detect what it needs to
 build the LLVM* OpenMP* Runtime Library.  To see the default settings, 
 type:
Index: runtime/Makefile
===================================================================
--- runtime/Makefile
+++ runtime/Makefile
@@ -13,7 +13,11 @@
 include $(omp_root)/tools/common.inc
 .PHONY: default all omp
 
-default: omp
+default:
+	@echo --- This Makefile system is deprecated and is not being updated anymore.
+	@echo --- It will be deleted in the future.
+	@echo --- To build libomp, please use the CMake build system
+	@echo --- which is documented in Build_With_CMake.txt
 
 all: omp stubs
 


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D12331.33201.patch
Type: text/x-patch
Size: 3627 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/openmp-commits/attachments/20150826/88f3395a/attachment.bin>