diff options
| author | Eelco Dolstra <e.dolstra@tudelft.nl> | 2010-05-12T22·13+0000 |
|---|---|---|
| committer | Eelco Dolstra <e.dolstra@tudelft.nl> | 2010-05-12T22·13+0000 |
| commit | aa45027818af8976dc73e6a299d5d918e5c51df1 (patch) | |
| tree | 6086eb0642bc90477397169d0ee3993c1789200e /src/libmain | |
| parent | a0e3b84fac56cad6377ecd1462058a6b29bb1ea8 (diff) | |
| parent | 8032f26ca0bd2233de066ce5786ff976bbd641ae (diff) | |
* Sync with the trunk.
Diffstat (limited to 'src/libmain')
| -rw-r--r-- | src/libmain/Makefile.am | 2 | ||||
| -rw-r--r-- | src/libmain/shared.cc | 12 |
2 files changed, 1 insertions, 13 deletions
diff --git a/src/libmain/Makefile.am b/src/libmain/Makefile.am index c2946febce34..a9ee6604255e 100644 --- a/src/libmain/Makefile.am +++ b/src/libmain/Makefile.am @@ -15,5 +15,5 @@ AM_CXXFLAGS = \ -DNIX_LIBEXEC_DIR=\"$(libexecdir)\" \ -DNIX_BIN_DIR=\"$(bindir)\" \ -DNIX_VERSION=\"$(VERSION)\" \ - -I$(srcdir)/.. ${aterm_include} -I$(srcdir)/../libutil \ + -I$(srcdir)/.. -I$(srcdir)/../libutil \ -I$(srcdir)/../libstore diff --git a/src/libmain/shared.cc b/src/libmain/shared.cc index d9cf9a86262a..3fbec4b5245d 100644 --- a/src/libmain/shared.cc +++ b/src/libmain/shared.cc @@ -13,8 +13,6 @@ #include <sys/stat.h> #include <unistd.h> -#include <aterm2.h> - namespace nix { @@ -87,9 +85,6 @@ static void setLogType(string lt) } -void initDerivationsHelpers(); - - static void closeStore() { try { @@ -176,9 +171,6 @@ static void initAndRun(int argc, char * * argv) string lt = getEnv("NIX_LOG_TYPE"); if (lt != "") setLogType(lt); - /* ATerm stuff. !!! find a better place to put this */ - initDerivationsHelpers(); - /* Put the arguments in a vector. */ Strings args, remaining; while (argc--) args.push_back(*argv++); @@ -333,10 +325,6 @@ int main(int argc, char * * argv) if (argc == 0) abort(); setuidInit(); - /* ATerm setup. */ - ATerm bottomOfStack; - ATinit(argc, argv, &bottomOfStack); - /* Turn on buffering for cerr. */ #if HAVE_PUBSETBUF std::cerr.rdbuf()->pubsetbuf(buf, sizeof(buf)); |