diff options
| author | doko <doko@6ca36cf4-e1d1-0310-8c6f-e303bb2178ca> | 2015-03-29 14:33:13 +0000 |
|---|---|---|
| committer | doko <doko@6ca36cf4-e1d1-0310-8c6f-e303bb2178ca> | 2015-03-29 14:33:13 +0000 |
| commit | 1eed2ad0ba855b3476738914e56a1b1e9822f37c (patch) | |
| tree | 0b0e96188d9dab31fdcb8f43fd82fa5b9d49bce6 /debian/rules.conf | |
| parent | 8a298a103a14932b98eb0a2d362be6ac5b44f34f (diff) | |
| download | gcc-5-1eed2ad0ba855b3476738914e56a1b1e9822f37c.tar.gz | |
- Prefer gnat-4.6 over gnat-4.8, don't configure with ada in gccgo builds
git-svn-id: svn://anonscm.debian.org/gcccvs/branches/sid/gcc-5@7929 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
Diffstat (limited to 'debian/rules.conf')
| -rw-r--r-- | debian/rules.conf | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/debian/rules.conf b/debian/rules.conf index 09bb225..02721ba 100644 --- a/debian/rules.conf +++ b/debian/rules.conf @@ -483,11 +483,11 @@ ifeq ($(PKGSOURCE),gcc-$(BASE_VERSION)) # Build gnat as part of the combiled gcc-x.y source package. Do not fail # if gnat is not present on unsupported architectures; the build scripts # will not use gnat anyway. - GNAT_BUILD_DEP := gnat-5 [$(ada_no_archs)] | gnat-4.9 [$(ada_no_archs)] | gnat-4.8 [$(ada_no_archs)] | gnat-4.6 (>= 4.6.4-2) [$(ada_no_archs)],, + GNAT_BUILD_DEP := gnat-5 [$(ada_no_archs)] | gnat-4.9 [$(ada_no_archs)] | gnat-4.6 (>= 4.6.4-2) [$(ada_no_archs)] | gnat-4.8 [$(ada_no_archs)],, endif else ifeq ($(single_package),yes) # Ditto, as part of the gcc-snapshot package. - GNAT_BUILD_DEP := gnat-5 [$(ada_no_archs)] | gnat-4.9 [$(ada_no_archs)] | gnat-4.8 [$(ada_no_archs)] | gnat-4.6 (>= 4.6.4-2) [$(ada_no_archs)],, + GNAT_BUILD_DEP := gnat-5 [$(ada_no_archs)] | gnat-4.9 [$(ada_no_archs)] | gnat-4.6 (>= 4.6.4-2) [$(ada_no_archs)] | gnat-4.8 [$(ada_no_archs)],, else ifeq ($(PKGSOURCE),gnat-$(BASE_VERSION)) # Special source package just for gnat. Fail early if gnat is not present, # rather than waste CPU cycles and fail later. |