Skip to content
Snippets Groups Projects
Commit 06ea5c8f authored by Ludovic Courtès's avatar Ludovic Courtès
Browse files

Update 'nix-upstream' sub-module. 

* nix-upstream: Update.
* daemon.am (AM_CXXFLAGS): Add -std=c++0x.
parent 4743a4da
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
daemon.am
+ 3
− 2
View file @ 06ea5c8f
...@@ -25,7 +25,8 @@ CLEANFILES += $(BUILT_SOURCES) ...@@ -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 = \ ...@@ -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
......
nix-upstream @ e7720aa1
Compare 24cb65ef...e7720aa1
Subproject commit 24cb65efc3c34e24fc653779a4d42cf4f31c6737 Subproject commit e7720aa10a1da63bb15a4587837d649268944943
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment