From 41ef6958a7606b1c151f7c0f8a696b83d3d3d06e Mon Sep 17 00:00:00 2001 From: Thomas Krijnen Date: Sat, 18 Nov 2017 16:50:38 +0100 Subject: [PATCH] Don't pass empty arguments to boost build --- nix/build-all.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nix/build-all.py b/nix/build-all.py index d95fdc5b67..0e00c36add 100644 --- a/nix/build-all.py +++ b/nix/build-all.py @@ -508,7 +508,7 @@ for PYTHON_VERSION, unicode_conf, abi_tag in PYTHON_VERSION_CONFS(): os.environ["CXXFLAGS"]=OLD_CXX_FLAGS os.environ["CFLAGS"]=OLD_C_FLAGS -str_concat = lambda prefix: lambda postfix: "=".join((prefix, postfix.strip())) +str_concat = lambda prefix: lambda postfix: "" if postfix.strip() == "" else "=".join((prefix, postfix.strip())) build_dependency("boost-%s" % (BOOST_VERSION,), mode="bjam", build_tool_args=["--stagedir=%s/install/boost-%s" % (DEPS_DIR, BOOST_VERSION), "--with-system", "--with-program_options", "--with-regex", "--with-thread", "--with-date_time", "--with-iostreams", "link=static"]+BOOST_ADDRESS_MODEL+list(map(str_concat("cxxflags"), CXXFLAGS.strip().split(' '))) + list(map(str_concat("linkflags"), LDFLAGS.strip().split(' '))) + ["stage", "-s", "NO_BZIP2=1"], download_url="http://downloads.sourceforge.net/project/boost/boost/%s/" % (BOOST_VERSION,), download_name="boost_%s.tar.bz2" % (BOOST_VERSION_UNDERSCORE,)) build_dependency(name="icu-%s" % (ICU_VERSION,), mode="icu", build_tool_args=["--enable-static", "--disable-shared"], download_url="http://download.icu-project.org/files/icu4c/%s/" % (ICU_VERSION,), download_name="icu4c-%s-src.tgz" % (ICU_VERSION_UNDERSCORE,))