diff options
author | Michael Stahl <mstahl@redhat.com> | 2012-11-07 18:11:37 +0100 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2012-11-07 18:34:16 +0100 |
commit | eed17d1f23bbefd5aae24cb7e75ecb37c8f28b4a (patch) | |
tree | 125b7f0cf3ad4ef9267db7a53d3b458330939df3 /solenv | |
parent | concat-deps: on Windows, compare paths case-insensitively (diff) | |
download | core-eed17d1f23bbefd5aae24cb7e75ecb37c8f28b4a.tar.gz core-eed17d1f23bbefd5aae24cb7e75ecb37c8f28b4a.zip |
concat-deps: tweak boost handling to depend on unpacked target
Change-Id: Iae93f7a81959a5d9c23e9bddb65e6154655374e6
Diffstat (limited to 'solenv')
-rw-r--r-- | solenv/bin/concat-deps.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/solenv/bin/concat-deps.c b/solenv/bin/concat-deps.c index c6177ce038ed..813c39dd7be9 100644 --- a/solenv/bin/concat-deps.c +++ b/solenv/bin/concat-deps.c @@ -113,7 +113,7 @@ int internal_boost = 0; static char* base_dir; -static char* out_dir; +static char* work_dir; #ifdef __GNUC__ #define clz __builtin_clz @@ -785,13 +785,13 @@ elide_dependency(const char* key, int key_len, } /* - * We collapse tens of internal boost headers to a single one, such + * We collapse tens of internal boost headers to the unpacked target, such * that you can re-compile / install boost and all is well. */ static void emit_single_boost_header(void) { -#define BOOST_HEADER "/inc/external/boost/bind.hpp" - fprintf(stdout, "%s" BOOST_HEADER " ", out_dir); +#define BOOST_TARGET "/UnpackedTarball/boost.done" + fprintf(stdout, "%s" BOOST_TARGET " ", work_dir); } static void emit_unpacked_target(char const*const token, char const*const end) @@ -1038,7 +1038,7 @@ const char *env_str; _usage(); return 1; } - if(get_var(&base_dir, "SRCDIR") || get_var(&out_dir, "OUTDIR")) + if(get_var(&base_dir, "SRCDIR") || get_var(&work_dir, "WORKDIR")) return 1; env_str = getenv("SYSTEM_BOOST"); |