diff options
| author | doko <doko@6ca36cf4-e1d1-0310-8c6f-e303bb2178ca> | 2013-06-17 16:25:37 +0000 |
|---|---|---|
| committer | doko <doko@6ca36cf4-e1d1-0310-8c6f-e303bb2178ca> | 2013-06-17 16:25:37 +0000 |
| commit | 329eeca22cfc52d62b4383b0af0c3a1c53d1f467 (patch) | |
| tree | fad5326a49336c5912623c7f35ea0d92130f16ee | |
| parent | f35f1fd0215df52caca417017a594cda8b6101d2 (diff) | |
| download | gcc-47-329eeca22cfc52d62b4383b0af0c3a1c53d1f467.tar.gz | |
* Fall back to the binutils version of the binutils build dependency
if the binutils version used for the build cannot be determined.
git-svn-id: svn://svn.debian.org/svn/gcccvs/branches/sid/gcc-4.7@6847 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | debian/rules.conf | 4 |
2 files changed, 11 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index b5c7695..a8932b3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +gcc-4.7 (4.7.3-6) UNRELEASED; urgency=low + + * Fall back to the binutils version of the binutils build dependency + if the binutils version used for the build cannot be determined. + + -- Matthias Klose <doko@debian.org> Mon, 17 Jun 2013 18:23:31 +0200 + gcc-4.7 (4.7.3-5) unstable; urgency=low * Update to SVN 20130614 (r200084) from the gcc-4_7-branch. diff --git a/debian/rules.conf b/debian/rules.conf index 287aa0d..8cee5e7 100644 --- a/debian/rules.conf +++ b/debian/rules.conf @@ -197,6 +197,10 @@ else | awk '/^ii/{print $$3;exit}' | sed 's/-.*//') endif endif +ifeq (,$(BINUTILSV)) + BINUTILSV := $(BINUTILSBDV) +endif + # FIXME; stripping doesn't work with gold #BINUTILS_BUILD_DEP += , binutils-gold (>= $(BINUTILSV)) [$(gold_archs)] |