0
0
mirror of https://github.com/mongodb/mongo.git synced 2024-12-01 09:32:32 +01:00
Commit Graph

4 Commits

Author SHA1 Message Date
Eliot Horowitz
5cca648b60 different hack for 32-bit solaris 2012-01-30 15:43:45 -05:00
Andy Schwerin
fe7421e8f0 SCons: Modify the libdeps module to support two methods for linking libdeps into programs.
This is used to fix linking of programs on Windows that depend on static
initializer execution in object files that don't contain symbols referenced
directly by the program at compile time (i.e., Command registration).

It also unifies the compilation of these sorts of programs on Windows and POSIX
systems, eliminating the use of a MergeLibrary when linking mongod and mongos.

This extension to libdeps could also be used to reimagine MergeLibrary to have
an implementation shared between Posix and Windows systems.  The existing
MergeLibrary system uses relocatable objects on Posix systems, and thus could
behave differently from the one on Windows, with respect to the exeuction of
static initializers.  That change is recommended future work.
2012-01-20 22:33:40 -08:00
Andy Schwerin
f6fc6431bf Fix build break for old versions of SCons.
Newer versions of SCons are more consistent about making lists out of TARGET and
SOURCE fields than older (1.2.0 and older) versions.  This patch bandaids that
problem, which was exposed by the libdeps module.
2012-01-17 17:01:15 -08:00
Andy Schwerin
30668e1c79 SCons updates to support variant directories.
This patch is a reorganization of our build files, which brings them slightly
closer in line with standard SCons organization.

In particular, the SConstruct file sets up the various "build environment"
objects, by examining the local system and command line parameters.  Then, it
delegates to some SConscript files, which describe build rules, like how to
compile "mongod" from source.

Typically, you would create several SConscript files for a project this large,
after breaking the project into logical sub projects, such as "platform
abstraction", "data manager", "query optimizer", etc.  That will be future work.
For now, we only separate out the special rules for executing smoke tests into
SConscript.smoke.  Pretty much all other build rules are in src/mongo/SConscript.

"tools" are placed in site_scons/site_tools.

This patch also includes better support for building and tracking dependencies
among static libraries ("libdeps" and "MergeLibrary"), and some incumbent, minor
restructuring.

This patch introduces a "warning" message from SCons about framework.o having
two rules that generate it.  It is harmless, for now, and will be removed in
future work.

Future work also includes eliminating use of the SCons "Glob" utility, and
restructuring the source code into sensible components.
2012-01-17 14:58:51 -08:00