diff options
| author | Jim Huang <jim.huang@linaro.org> | 2011-03-14 00:07:17 +0800 |
|---|---|---|
| committer | Jim Huang <jim.huang@linaro.org> | 2011-03-14 00:07:17 +0800 |
| commit | 9203ce4c7c8a19954ecea6e59557ccafc2d021c3 (patch) | |
| tree | 375411aa763b533d684bf2eec09b91b773886e9d | |
| parent | 9a48f2c41c45803b9b219ea289a97b4c766a1c44 (diff) | |
| parent | ce5253b0182e519f964aed9d2a622782c59d1991 (diff) | |
Merge branch 'master' of git://android.git.kernel.org/toolchain/build
Conflicts:
Makefile.in
| -rw-r--r-- | Makefile.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.in b/Makefile.in index a040b6e..3dfbd76 100644 --- a/Makefile.in +++ b/Makefile.in @@ -233,7 +233,7 @@ config-target-binutils: stmp-config-target-binutils # We do not want to enable shared libraries in binutils BINUTILS_CONFIG_ARGS=--prefix=$(prefix) \ --target=${cur_target} --host=${cur_host} --build=${cur_build} \ - $(baseargs) --disable-shared --disable-werror + $(baseargs) --disable-shared --enable-install-libbfd --disable-werror stmp-config-target-binutils: config.status $(canadian_stmp) ([ -d ${BINUTILS_VERSION} ] || \ mkdir ${BINUTILS_VERSION}) && \ |