Pass -DDEBUG when doing a debug build

[builder.git] / source / package.cpp

diff --git a/source/package.cpp b/source/package.cpp
index 3072fd6a65ccd1d6a6303d54b80ffdb789ca35da..2d5d97ccd49a4a8585c8ae573b549b0569eefb90 100644 (file)
--- a/source/package.cpp
+++ b/source/package.cpp
@@ -7,19 +7,6 @@
 using namespace std;
 using namespace Msp;
 
-PackageRef::PackageRef(Builder &b, const string &n):
-       builder(b),
-       name(n),
-       package(0)
-{ }
-
-Package *PackageRef::resolve()
-{
-       if(!package)
-               package=builder.get_package(name);
-       return package;
-}
-
 Package::Package(Builder &b, const string &n, const Path::Path &s):
        builder(b),
        name(n),
@@ -90,7 +77,10 @@ void Package::create_build_info()
        }
 
        if(strtobool(config.get_option("debug").value))
+       {
                build_info.cflags.push_back("-ggdb");
+               build_info.defines.push_back("DEBUG");
+       }
 
        build_info.unique();
        export_binfo.unique();
@@ -107,7 +97,8 @@ void Package::create_build_info()
 
 void Package::process_options(const RawOptionMap &opts)
 {
-       config.process(opts);
+       if(config.process(opts))
+               config.save(source/".options.cache");
 }
 
 Package *Package::create(Builder &b, const string &name)
@@ -126,6 +117,8 @@ Package *Package::create(Builder &b, const string &name)
                        info.push_back("-lGL");
                else if(name=="pthread")
                        info.push_back("-lpthread");
+               else if(name=="gmpxx")
+                       info.push_back("-lgmpxx");
                else
                        return 0;
        }
@@ -156,6 +149,8 @@ void Package::init_buildable()
                config.add_option("includedir", "$prefix/lib",     "Library installation directory");
        if(flags&DATA)
                config.add_option("includedir", "$prefix/share",   "Data installation directory");*/
+
+       config.load(source/".options.cache");
 }
 
 unsigned Package::get_install_flags()
@@ -186,6 +181,7 @@ Package::Loader::Loader(Package &p):
        add("program",     &Loader::program);
        add("library",     &Loader::library);
        add("headers",     &Loader::headers);
+       add("build_info",  &Loader::build_info);
 }
 
 Package::Loader::~Loader()
@@ -218,3 +214,8 @@ void Package::Loader::headers(const string &n)
        load_sub(prog);
        pkg.components.push_back(prog);
 }
+
+void Package::Loader::build_info()
+{
+       load_sub(pkg.build_info);
+}