From 2d22d6061e2c4d394bddebd7f133a56b356f21fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Chmielowski?= Date: Tue, 20 Oct 2015 15:22:39 +0200 Subject: [PATCH] Pass {C,CPP,LD}FLAGS used in main ./configure call to invocations from deps --- configure.ac | 3 +++ rebar.config.script | 7 ++++++- vars.config.in | 4 ++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index d30a490d0..c7e7bcd4a 100644 --- a/configure.ac +++ b/configure.ac @@ -273,5 +273,8 @@ AC_SUBST(iconv) AC_SUBST(debug) AC_SUBST(lager) AC_SUBST(tools) +AC_SUBST(CFLAGS) +AC_SUBST(CPPFLAGS) +AC_SUBST(LDFLAGS) AC_OUTPUT diff --git a/rebar.config.script b/rebar.config.script index 633433c19..e0a8923cf 100644 --- a/rebar.config.script +++ b/rebar.config.script @@ -66,10 +66,15 @@ Deps = [{p1_cache_tab, ".*", {git, "https://github.com/processone/cache_tab"}}, {oauth2, ".*", {git, "https://github.com/prefiks/oauth2.git"}}, {xmlrpc, ".*", {git, "https://github.com/rds13/xmlrpc.git"}}], +CFLags = proplists:get_value(cflags, Cfg, ""), +CPPFLags = proplists:get_value(cppflags, Cfg, ""), +LDFLags = proplists:get_value(ldflags, Cfg, ""), + ConfigureCmd = fun(Pkg, Flags) -> {'get-deps', "sh -c 'cd deps/" ++ Pkg ++ - " && ./configure" ++ Flags ++ "'"} + " && CFLAGS=\""++ CFLags ++"\" CPPFLAGS=\""++ CPPFLags ++"\" LDFLAGS=\""++ LDFLags ++"\"" ++ + " ./configure" ++ Flags ++ "'"} end, XMLFlags = lists:foldl( diff --git a/vars.config.in b/vars.config.in index 2cd5d8e9a..69cc516f7 100644 --- a/vars.config.in +++ b/vars.config.in @@ -47,6 +47,10 @@ {libdir, "{{release_dir}}/lib"}. {docdir, "{{release_dir}}/doc"}. +{ldflags, "@LDFLAGS@"}. +{cflags, "@CFLAGS@"}. +{cppflags, "@CPPFLAGS@"}. + %% Local Variables: %% mode: erlang %% End: