[gcc-7] 124/354: - Fix nvptx-none configury

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch master
in repository gcc-7.

commit 1b50308cf1edcc363953f101a4f4198488688d25
Author: doko <doko at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date:   Thu Mar 2 08:14:31 2017 +0000

     - Fix nvptx-none configury
    
    
    git-svn-id: svn+ssh://svn.debian.org/svn/gcccvs/branches/sid/gcc-7@9325 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
 debian/rules.d/binary-nvptx.mk | 6 +-----
 debian/rules2                  | 6 +++++-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/debian/rules.d/binary-nvptx.mk b/debian/rules.d/binary-nvptx.mk
index c5b3060..c7a855a 100644
--- a/debian/rules.d/binary-nvptx.mk
+++ b/debian/rules.d/binary-nvptx.mk
@@ -18,11 +18,7 @@ dirs_nvptx = \
 
 files_nvptx = \
 	$(PF)/bin/$(DEB_TARGET_GNU_TYPE)-accel-nvptx-none-gcc$(pkg_ver) \
-	$(gcc_lexec_dir)/accel/nvptx-none \
-
-files_nvptx = \
-	$(PF)/bin/$(DEB_TARGET_GNU_TYPE)-accel-nvptx-none-gcc \
-	$(gcc_lexec_dir)/accel/nvptx-none \
+	$(gcc_lexec_dir)/accel/nvptx-none
 
 # not needed: libs moved, headers not needed for lto1
 #	$(PF)/nvptx-none
diff --git a/debian/rules2 b/debian/rules2
index 91d9b7e..2225808 100644
--- a/debian/rules2
+++ b/debian/rules2
@@ -1298,7 +1298,6 @@ endif
 CONFARGS_NVPTX := \
 	--prefix=/$(PF) \
         --libexecdir=/$(libexecdir) \
-	--program-suffix=-$(BASE_VERSION) \
 	--with-gcc-major-version-only \
 	--disable-bootstrap \
 	--disable-sjlj-exceptions \
@@ -1312,6 +1311,11 @@ CONFARGS_NVPTX := \
 
 #	--with-build-time-tools=/$(PF)/nvptx-none/bin
 
+CONFARGS_NVPTX += --program-prefix=nvptx-none-
+ifeq ($(versioned_packages),yes)
+  CONFARGS_NVPTX += --program-suffix=-$(BASE_VERSION)
+endif
+
 # FIXME: must not be run in parrallel with jit and hppa64 builds ...
 $(configure_nvptx_stamp): $(build_stamp)
 	dh_testdir

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/gcc-7.git