aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/build-data/cc/msvc.txt2
-rw-r--r--src/build-data/compiler_detection/msvc_version.c8
-rw-r--r--src/build-data/detect_version.cpp56
-rwxr-xr-xsrc/scripts/python_unittests.py133
4 files changed, 58 insertions, 141 deletions
diff --git a/src/build-data/cc/msvc.txt b/src/build-data/cc/msvc.txt
index b816d33f8..66949970d 100644
--- a/src/build-data/cc/msvc.txt
+++ b/src/build-data/cc/msvc.txt
@@ -21,6 +21,8 @@ size_optimization_flags "/O1 /Os"
# for using a PDB file:
debug_info_flags "/Zi /FS"
+preproc_flags "/nologo /EP"
+
lang_flags "/EHs /GR"
warning_flags "/W4 /wd4250 /wd4251 /wd4275"
diff --git a/src/build-data/compiler_detection/msvc_version.c b/src/build-data/compiler_detection/msvc_version.c
deleted file mode 100644
index 054f69d28..000000000
--- a/src/build-data/compiler_detection/msvc_version.c
+++ /dev/null
@@ -1,8 +0,0 @@
-// _MSC_VER Defined as an integer literal that encodes the major and minor
-// number elements of the compiler's version number. The major number is
-// the first element of the period-delimited version number and the minor
-// number is the second element. For example, if the version number of the
-// Visual C++ compiler is 17.00.51106.1, the _MSC_VER macro evaluates to 1700.
-// https://msdn.microsoft.com/en-us/library/b0084kay.aspx
-
-_MSC_VER
diff --git a/src/build-data/detect_version.cpp b/src/build-data/detect_version.cpp
new file mode 100644
index 000000000..55e5db98d
--- /dev/null
+++ b/src/build-data/detect_version.cpp
@@ -0,0 +1,56 @@
+/*
+* This file is preprocessed to produce output that is examined by
+* configure.py to determine the compilers version number.
+*/
+
+#if defined(_MSC_VER)
+
+// _MSC_VER Defined as an integer literal that encodes the major and minor
+// number elements of the compiler's version number. The major number is
+// the first element of the period-delimited version number and the minor
+// number is the second element. For example, if the version number of the
+// Visual C++ compiler is 17.00.51106.1, the _MSC_VER macro evaluates to 1700.
+// https://msdn.microsoft.com/en-us/library/b0084kay.aspx
+
+MSVC _MSC_VER
+
+#elif defined(__clang__)
+
+#if defined(__apple_build_version__)
+
+/*
+Map Apple XCode versions back to standard Clang
+
+This is not a complete map, since we don't support any versions of
+Clang before 3.5 in any case, and it arbitrarily maps any version with
+XCode >= 9 to Clang 4.0. This is fine because we don't currently need
+any features not available in Clang 4.0
+*/
+
+#if __clang_major__ >= 9
+CLANG 4 0
+#elif __clang__major__ == 8
+CLANG 3 9
+#elif __clang__major__ == 7 && __clang__minor__ == 3
+CLANG 3 8
+#elif __clang__major__ == 7
+CLANG 3 7
+#else
+CLANG 3 5
+#endif
+
+#else
+
+CLANG __clang_major__ __clang_minor__
+
+#endif
+
+#elif defined(__GNUG__)
+
+GCC __GNUC__ __GNUC_MINOR__
+
+#else
+
+UNKNOWN 0 0
+
+#endif
diff --git a/src/scripts/python_unittests.py b/src/scripts/python_unittests.py
index 337f5369e..a6a22f3f0 100755
--- a/src/scripts/python_unittests.py
+++ b/src/scripts/python_unittests.py
@@ -15,7 +15,6 @@ import unittest
sys.path.append("../..") # Botan repo root
from configure import AmalgamationHelper # pylint: disable=wrong-import-position
-from configure import CompilerDetector # pylint: disable=wrong-import-position
from configure import ModulesChooser # pylint: disable=wrong-import-position
class AmalgamationHelperTests(unittest.TestCase):
@@ -62,138 +61,6 @@ class AmalgamationHelperTests(unittest.TestCase):
self.assertEqual(AmalgamationHelper.is_any_include("#include <botan/oids.h> // comment"),
"botan/oids.h")
-class CompilerDetection(unittest.TestCase):
-
- def test_gcc_invalid(self):
- detector = CompilerDetector("gcc", "g++", "linux")
-
- compiler_out = ""
- self.assertEqual(detector.version_from_compiler_output(compiler_out), None)
- compiler_out = "gcc version 20170406 (Ubuntu 6.3.0-12ubuntu2)"
- self.assertEqual(detector.version_from_compiler_output(compiler_out), None)
-
- def test_clang_invalid(self):
- detector = CompilerDetector("clang", "clang++", "linux")
-
- compiler_out = ""
- self.assertEqual(detector.version_from_compiler_output(compiler_out), None)
- compiler_out = "clang version 20170406."
- self.assertEqual(detector.version_from_compiler_output(compiler_out), None)
-
- def test_msvc_invalid(self):
- detector = CompilerDetector("msvc", "cl.exe", "windows")
-
- compiler_out = ""
- self.assertEqual(detector.version_from_compiler_output(compiler_out), None)
- compiler_out = "Microsoft (R) C/C++ Optimizing Compiler Version 19.00.24213.1 for x86"
- self.assertEqual(detector.version_from_compiler_output(compiler_out), None)
-
- def test_gcc_version(self):
- detector = CompilerDetector("gcc", "g++", "linux")
- compiler_out = """Using built-in specs.
-COLLECT_GCC=/usr/bin/gcc
-COLLECT_LTO_WRAPPER=/usr/lib/gcc/x86_64-linux-gnu/6/lto-wrapper
-Target: x86_64-linux-gnu
-Configured with: ../src/configure -v --with-pkgversion='Ubuntu 6.3.0-12ubuntu2' --with-bugurl=file:///usr/share/doc/gcc-6/README.Bugs --enable-languages=c,ada,c++,java,go,d,fortran,objc,obj-c++ --prefix=/usr --program-suffix=-6 --program-prefix=x86_64-linux-gnu- --enable-shared --enable-linker-build-id --libexecdir=/usr/lib --without-included-gettext --enable-threads=posix --libdir=/usr/lib --enable-nls --with-sysroot=/ --enable-clocale=gnu --enable-libstdcxx-debug --enable-libstdcxx-time=yes --with-default-libstdcxx-abi=new --enable-gnu-unique-object --disable-vtable-verify --enable-libmpx --enable-plugin --enable-default-pie --with-system-zlib --disable-browser-plugin --enable-java-awt=gtk --enable-gtk-cairo --with-java-home=/usr/lib/jvm/java-1.5.0-gcj-6-amd64/jre --enable-java-home --with-jvm-root-dir=/usr/lib/jvm/java-1.5.0-gcj-6-amd64 --with-jvm-jar-dir=/usr/lib/jvm-exports/java-1.5.0-gcj-6-amd64 --with-arch-directory=amd64 --with-ecj-jar=/usr/share/java/eclipse-ecj.jar --with-target-system-zlib --enable-objc-gc=auto --enable-multiarch --disable-werror --with-arch-32=i686 --with-abi=m64 --with-multilib-list=m32,m64,mx32 --enable-multilib --with-tune=generic --enable-checking=release --build=x86_64-linux-gnu --host=x86_64-linux-gnu --target=x86_64-linux-gnu
-Thread model: posix
-gcc version 6.3.0 20170406 (Ubuntu 6.3.0-12ubuntu2)"""
- self.assertEqual(detector.version_from_compiler_output(compiler_out), "6.3")
-
- def test_clang_version(self):
- detector = CompilerDetector("clang", "clang++", "linux")
- compiler_out = """clang version 4.0.0-1ubuntu1 (tags/RELEASE_400/rc1)
-Target: x86_64-pc-linux-gnu
-Thread model: posix
-InstalledDir: /usr/bin
-Found candidate GCC installation: /usr/bin/../lib/gcc/i686-linux-gnu/6
-Found candidate GCC installation: /usr/bin/../lib/gcc/i686-linux-gnu/6.3.0
-Found candidate GCC installation: /usr/bin/../lib/gcc/x86_64-linux-gnu/4.9
-Found candidate GCC installation: /usr/bin/../lib/gcc/x86_64-linux-gnu/4.9.4
-Found candidate GCC installation: /usr/bin/../lib/gcc/x86_64-linux-gnu/5
-Found candidate GCC installation: /usr/bin/../lib/gcc/x86_64-linux-gnu/5.4.1
-Found candidate GCC installation: /usr/bin/../lib/gcc/x86_64-linux-gnu/6
-Found candidate GCC installation: /usr/bin/../lib/gcc/x86_64-linux-gnu/6.3.0
-Found candidate GCC installation: /usr/lib/gcc/i686-linux-gnu/6
-Found candidate GCC installation: /usr/lib/gcc/i686-linux-gnu/6.3.0
-Found candidate GCC installation: /usr/lib/gcc/x86_64-linux-gnu/4.9
-Found candidate GCC installation: /usr/lib/gcc/x86_64-linux-gnu/4.9.4
-Found candidate GCC installation: /usr/lib/gcc/x86_64-linux-gnu/5
-Found candidate GCC installation: /usr/lib/gcc/x86_64-linux-gnu/5.4.1
-Found candidate GCC installation: /usr/lib/gcc/x86_64-linux-gnu/6
-Found candidate GCC installation: /usr/lib/gcc/x86_64-linux-gnu/6.3.0
-Selected GCC installation: /usr/bin/../lib/gcc/x86_64-linux-gnu/6.3.0
-Candidate multilib: .;@m64
-Selected multilib: .;@m64"""
- self.assertEqual(detector.version_from_compiler_output(compiler_out), "4.0")
-
- def test_clang_version_two_digit(self):
- # Output from Crystax NDK. Note: there is a trailing whitespace behind the version
- # number for whatever reason. But let's keep the original output unchanged.
- # pylint: disable=trailing-whitespace
- detector = CompilerDetector("clang", "clang++", "android")
- compiler_out = """clang version 3.7
-Target: i686-none-linux-android
-Thread model: posix
-Found candidate GCC installation: /foo/crystax-toolchains/x86/bin/../lib/gcc/i686-linux-android/4.9
-Selected GCC installation: /foo/crystax-toolchains/x86/bin/../lib/gcc/i686-linux-android/4.9
-Candidate multilib: .;@m32
-Selected multilib: .;@m32"""
- self.assertEqual(detector.version_from_compiler_output(compiler_out), "3.7")
-
- def test_clang_version_appleclang(self):
- detector = CompilerDetector("clang", "clang++", "darwin")
- compiler_out = """Apple LLVM version 8.1.0 (clang-802.0.42)
-Target: x86_64-apple-darwin16.7.0
-Thread model: posix
-InstalledDir: /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin"""
- self.assertEqual(detector.version_from_compiler_output(compiler_out), "3.9")
-
- compiler_out = """Apple LLVM version 9.0.0 (clang-900.0.35)
-Target: x86_64-apple-darwin16.7.0
-Thread model: posix
-InstalledDir: /Applications/Xcode-beta.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin"""
- self.assertEqual(detector.version_from_compiler_output(compiler_out), "4.0")
-
- def test_clang_version_appleclang_intermediate(self):
- # fake versions in between the knwon ones
- # clang-700.0.0 is lower than all known versions
- # clang-802.1.0 is a minor update of known clang-802
- # clang-1111.9.99 is a random future value
- detector = CompilerDetector("clang", "clang++", "darwin")
-
- compiler_out = """Apple LLVM version 7.0.0 (clang-700.0.0)
-Target: x86_64-apple-darwin16.7.0
-Thread model: posix
-InstalledDir: /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin"""
- self.assertEqual(detector.version_from_compiler_output(compiler_out), "3.7")
-
- compiler_out = """Apple LLVM version 8.1.1 (clang-802.1.0)
-Target: x86_64-apple-darwin16.7.0
-Thread model: posix
-InstalledDir: /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin"""
- self.assertEqual(detector.version_from_compiler_output(compiler_out), "3.9")
-
- compiler_out = """Apple LLVM version 11.11.0 (clang-1111.9.99)
-Target: x86_64-apple-darwin16.7.0
-Thread model: posix
-InstalledDir: /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin"""
- self.assertEqual(detector.version_from_compiler_output(compiler_out), "4.0")
-
- def test_msvc_version(self):
- detector = CompilerDetector("msvc", "cl.exe", "windows")
- compiler_out = """msvc_version.c
-
-1900
-"""
- self.assertEqual(detector.version_from_compiler_output(compiler_out), "19.0")
-
- compiler_out = """msvc_version.c
-
-1910
-"""
- self.assertEqual(detector.version_from_compiler_output(compiler_out), "19.10")
-
-
class ModulesChooserResolveDependencies(unittest.TestCase):
def test_base(self):
available_modules = set(["A", "B"])
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-24 01:04:25 +0000