From 063c34f11fef8f6a4debeaa5d380831c53e493f9 Mon Sep 17 00:00:00 2001 From: mark Date: Fri, 23 Dec 2016 11:08:49 +0100 Subject: [PATCH] BUG: CC not being properly exported in some make scripts (fixes #12) --- BUILD.md | 10 ++++++++++ makeCGAL | 2 +- makeLLVM | 2 +- makeTecio | 2 +- 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/BUILD.md b/BUILD.md index d8f4a6a..f650940 100644 --- a/BUILD.md +++ b/BUILD.md @@ -336,6 +336,16 @@ The minimum CMake requirements for building various components. 3.5 ParaView-5.1.0 +### GCC Minimum Requirements + +The minimum gcc/g++ requirements for building various components. + + 4.7 llvm-3.7.0 + 4.7 llvm-3.6.2 + 4.7 llvm-3.5.2 + 4.4 llvm-3.4.2 + + [page gcc]: http://gcc.gnu.org/releases.html [page gmp]: http://gmplib.org/ diff --git a/makeCGAL b/makeCGAL index 1d5178e..b5d49e4 100755 --- a/makeCGAL +++ b/makeCGAL @@ -91,7 +91,7 @@ USAGE } #------------------------------------------------------------------------------ # Ensure CMake gets the correct C/C++ compiler -[ -n "$WM_CC" ] && export CC="$WM_CCX" +[ -n "$WM_CC" ] && export CC="$WM_CC" [ -n "$WM_CXX" ] && export CXX="$WM_CXX" unset optHeadersOnly diff --git a/makeLLVM b/makeLLVM index ede1394..bd5914f 100755 --- a/makeLLVM +++ b/makeLLVM @@ -89,7 +89,7 @@ USAGE } #----------------------------------------------------------------------------- # Ensure CMake gets the correct C/C++ compiler -[ -n "$WM_CC" ] && export CC="$WM_CCX" +[ -n "$WM_CC" ] && export CC="$WM_CC" [ -n "$WM_CXX" ] && export CXX="$WM_CXX" # Parse options diff --git a/makeTecio b/makeTecio index ea2cea3..df7daff 100755 --- a/makeTecio +++ b/makeTecio @@ -77,7 +77,7 @@ USAGE } #------------------------------------------------------------------------------ # Ensure CMake gets the correct C/C++ compiler -[ -n "$WM_CC" ] && export CC="$WM_CCX" +[ -n "$WM_CC" ] && export CC="$WM_CC" [ -n "$WM_CXX" ] && export CXX="$WM_CXX" # Parse options