Split amalagamation into ISA specific objects

4 files changed, 9 insertions, 5 deletions

diff --git a/src/build-data/arch/x86_32.txt b/src/build-data/arch/x86_32.txt
index 54f821a84..89802124d 100644
--- a/src/build-data/arch/x86_32.txt
+++ b/src/build-data/arch/x86_32.txt
@@ -69,7 +69,6 @@ sse4.2
 avx2
 bmi2
 aesni
-clmul
 rdrand
 sha
 </isa_extensions>
diff --git a/src/build-data/cc/clang.txt b/src/build-data/cc/clang.txt
index a7d334aee..cbb68bb21 100644
--- a/src/build-data/cc/clang.txt
+++ b/src/build-data/cc/clang.txt
@@ -38,8 +38,7 @@ sse4.1 -> "-msse4.1"
 sse4.2 -> "-msse4.2"
 avx2   -> "-mavx2"
 bmi2   -> "-mbmi2"
-aesni  -> "-maes"
-clmul  -> "-mpclmul"
+aesni  -> "-maes -mpclmul"
 rdrand -> "-mrdrnd"
 sha    -> "-msha"
 altivec -> "-maltivec"
diff --git a/src/build-data/cc/gcc.txt b/src/build-data/cc/gcc.txt
index 8db3fdf61..a22450f3b 100644
--- a/src/build-data/cc/gcc.txt
+++ b/src/build-data/cc/gcc.txt
@@ -43,8 +43,7 @@ sse4.1  -> "-msse4.1"
 sse4.2  -> "-msse4.2"
 avx2    -> "-mavx2"
 bmi2    -> "-mbmi2"
-aesni   -> "-maes"
-clmul   -> "-mpclmul"
+aesni   -> "-maes -mpclmul"
 rdrand  -> "-mrdrnd"
 sha     -> "-msha"
 altivec -> "-maltivec"
diff --git a/src/scripts/install.py b/src/scripts/install.py
index 69d3a4286..0bf74b7a4 100755
--- a/src/scripts/install.py
+++ b/src/scripts/install.py
@@ -177,6 +177,13 @@ def main(args = None):
         shutil.copyfile(cfg['botan_pkgconfig'],
                         os.path.join(pkgconfig_dir, os.path.basename(cfg['botan_pkgconfig'])))
 
+    if 'ffi' in cfg['mod_list'].split('\n'):
+        logging.debug('FFI enabled - installing Python module')
+        def make_py_lib_path(py_ver):
+            print sys.path
+        python_dir = cfg['python_dir']
+        logging.debug('Python dir %s' % (python_dir))
+
     shutil.rmtree(botan_doc_dir, True)
     shutil.copytree(cfg['doc_output_dir'], botan_doc_dir)