diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2014-04-03 23:55:31 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2014-04-03 23:55:51 +0200 |
| commit | 06ea5c8f6f398710aef45c3b131c6f03690f0e4c (patch) | |
| tree | ec410e4ec21acf6f68d2bb3dcca24b326b318227 | |
| parent | 4743a4da9b49d16b62c66e9f1e6094394e3e655b (diff) | |
| download | guix-06ea5c8f6f398710aef45c3b131c6f03690f0e4c.tar.gz guix-06ea5c8f6f398710aef45c3b131c6f03690f0e4c.zip | |
Update 'nix-upstream' sub-module.
* nix-upstream: Update.
* daemon.am (AM_CXXFLAGS): Add -std=c++0x.
| -rw-r--r-- | daemon.am | 5 | ||||
| m--------- | nix-upstream | 0 |
2 files changed, 3 insertions, 2 deletions
@@ -25,7 +25,8 @@ CLEANFILES += $(BUILT_SOURCES) noinst_LIBRARIES = libformat.a libutil.a libstore.a -AM_CXXFLAGS = -Wall +# Use '-std=c++0x' for 'std::shared_ptr'. +AM_CXXFLAGS = -Wall -std=c++0x libformat_a_SOURCES = \ nix/boost/format/free_funcs.cc \ @@ -119,7 +120,7 @@ libstore_a_CPPFLAGS = \ -DNIX_BIN_DIR=\"$(bindir)\" \ -DOPENSSL_PATH="\"guix-authenticate\"" -libstore_a_CXXFLAGS = \ +libstore_a_CXXFLAGS = $(AM_CXXFLAGS) \ $(SQLITE3_CFLAGS) $(LIBGCRYPT_CFLAGS) bin_PROGRAMS = guix-daemon diff --git a/nix-upstream b/nix-upstream -Subproject 24cb65efc3c34e24fc653779a4d42cf4f31c673 +Subproject e7720aa10a1da63bb15a4587837d64926894494 |