me
/
guix
Archived
1
0
Fork 0
Code

Update 'nix-upstream' sub-module. 

* nix-upstream: Update.
* daemon.am (AM_CXXFLAGS): Add -std=c++0x.
master
Ludovic Courtès 2014-04-03 23:55:31 +02:00
parent 4743a4da9b
commit 06ea5c8f6f
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
daemon.am
View File

@ -25,7 +25,8 @@ CLEANFILES += $(BUILT_SOURCES)
noinst_LIBRARIES = libformat.a libutil.a libstore.a 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 = \ libformat_a_SOURCES = \
nix/boost/format/free_funcs.cc \ nix/boost/format/free_funcs.cc \
@ -119,7 +120,7 @@ libstore_a_CPPFLAGS = \
-DNIX_BIN_DIR=\"$(bindir)\" \ -DNIX_BIN_DIR=\"$(bindir)\" \
-DOPENSSL_PATH="\"guix-authenticate\"" -DOPENSSL_PATH="\"guix-authenticate\""
libstore_a_CXXFLAGS = \ libstore_a_CXXFLAGS = $(AM_CXXFLAGS) \
$(SQLITE3_CFLAGS) $(LIBGCRYPT_CFLAGS) $(SQLITE3_CFLAGS) $(LIBGCRYPT_CFLAGS)
bin_PROGRAMS = guix-daemon bin_PROGRAMS = guix-daemon

2
nix-upstream

@ -1 +1 @@
Subproject commit 24cb65efc3c34e24fc653779a4d42cf4f31c6737 Subproject commit e7720aa10a1da63bb15a4587837d649268944943