Applied patch as discussed in #1040 (#1045)

* Applied patch as discussed in #1040

* Adding extra compilation flags to extensions #1040

tlcore, dbcore and libcore did not have compilation flags.
It failed compiling on Macos because it did not use C++11.

Co-authored-by: Thomas Ferreira de Lima <tlima@princeton.edu>
This commit is contained in:
Matthias Köfferlein 2022-04-02 16:07:25 +02:00 committed by GitHub
parent 4d55ba2dc5
commit 5929ea3bc6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions

View File

@ -273,8 +273,6 @@ class Config(object):
quote_path("-I" + os.path.join(bits, "curl", "include"))]
else:
return []
elif platform.system() == "Darwin":
return []
else:
return ["-Wno-strict-aliasing", # Avoids many "type-punned pointer" warnings
"-std=c++11", # because we use unordered_map/unordered_set
@ -534,6 +532,7 @@ tl = Extension(config.root + '.tlcore',
include_dirs=[_tl_path, _gsi_path, _pya_path],
extra_objects=[config.path_of('_tl', _tl_path), config.path_of('_gsi', _gsi_path), config.path_of('_pya', _pya_path)],
extra_link_args=config.link_args('tlcore'),
extra_compile_args=config.compile_args('tlcore'),
sources=list(tl_sources))
# ------------------------------------------------------------------
@ -547,6 +546,7 @@ db = Extension(config.root + '.dbcore',
include_dirs=[_db_path, _tl_path, _gsi_path, _pya_path],
extra_objects=[config.path_of('_db', _db_path), config.path_of('_tl', _tl_path), config.path_of('_gsi', _gsi_path), config.path_of('_pya', _pya_path)],
extra_link_args=config.link_args('dbcore'),
extra_compile_args=config.compile_args('dbcore'),
sources=list(db_sources))
# ------------------------------------------------------------------
@ -560,6 +560,7 @@ lib = Extension(config.root + '.libcore',
include_dirs=[_lib_path, _tl_path, _gsi_path, _pya_path],
extra_objects=[config.path_of('_lib', _lib_path), config.path_of('_tl', _tl_path), config.path_of('_gsi', _gsi_path), config.path_of('_pya', _pya_path)],
extra_link_args=config.link_args('libcore'),
extra_compile_args=config.compile_args('libcore'),
sources=list(lib_sources))
# ------------------------------------------------------------------
@ -573,6 +574,7 @@ rdb = Extension(config.root + '.rdbcore',
include_dirs=[_rdb_path, _tl_path, _gsi_path, _pya_path],
extra_objects=[config.path_of('_rdb', _rdb_path), config.path_of('_tl', _tl_path), config.path_of('_gsi', _gsi_path), config.path_of('_pya', _pya_path)],
extra_link_args=config.link_args('rdbcore'),
extra_compile_args=config.compile_args('rdbcore'),
sources=list(rdb_sources))
# ------------------------------------------------------------------