Build updates for Mac and Linux #26
Conversation
|
|
||
| template <variant_base::enum_type_t E> | ||
| void data_table_column<E>::push_back_impl(const variant& value, variant* p = 0) | ||
| void data_table_column<E>::push_back_impl(const variant& value, variant* p/* = 0*/) |
There was a problem hiding this comment.
Why not just remove rather than commenting?
There was a problem hiding this comment.
Commenting defaults is the style used elsewhere in the project.
There was a problem hiding this comment.
OK. Not nice but probably better to be consistent.
There was a problem hiding this comment.
It's quite common to do this as 'documentation' of what the default value is. (I've never seen the purpose really.)
Ought to be using nullptr of course :)
| if sys.platform == 'linux2': | ||
| libs += ['libxerces-c-3.1'] | ||
| linkflags = ['-Wl,--gc-sections', '-Wl,-rpath', '.'] | ||
| if sys.platform == 'darwin': |
There was a problem hiding this comment.
Should this be elif and also a catch-all else at the end to report an unsupported platform?
There was a problem hiding this comment.
I'll add elif and else raise but I don't think we gain that much - the likelihood of compiling anywhere else is very slim and the previous script didn't raise if Linux wasn't the platform being targetted.
| 'libboost_filesystem', | ||
| 'libboost_iostreams', | ||
| 'libboost_regex', | ||
| 'libboost_system'] |
There was a problem hiding this comment.
libs is overwritten in the darwin case so shouldn't this just be inside the linux2 branch?
There was a problem hiding this comment.
In the darwin case, libs uses these names to build absolute paths to the static libraries to be linked.
…also fixes at least 2 bugs...
|
As I've also pushed a change here now, I think it would be good if someone else also approved. |
4 participants
scons now builds a mac build (with statically linked xerces and boost) and a Linux build with shared libs for xerces and boost.
I'd like to keep these consistent and preferably statically linked but the boost RPM in RHEL that I'm using appears to not compile the boost static libs as PIC.