diff options
author | Igor Pashev <pashev.igor@gmail.com> | 2019-11-19 17:35:47 +0300 |
---|---|---|
committer | Igor Pashev <pashev.igor@gmail.com> | 2019-11-19 17:35:47 +0300 |
commit | 03bebac19e6fef19299d7326d3ee41f8a7dd1316 (patch) | |
tree | bb413d22ada331790f08b7b9a592e5ab95cd8918 /debian/patches/config-ml.diff | |
parent | 94a19f31b81e9e7e295414fe2ad2302e0db25a08 (diff) | |
parent | 8f6c4b0033c72f8ac14694c419a99458339dd6a9 (diff) | |
download | gcc-9-03bebac19e6fef19299d7326d3ee41f8a7dd1316.tar.gz |
Merge tag 'debian/9.2.1-19'
Diffstat (limited to 'debian/patches/config-ml.diff')
-rw-r--r-- | debian/patches/config-ml.diff | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/debian/patches/config-ml.diff b/debian/patches/config-ml.diff index 5ce6ad6..36a16d1 100644 --- a/debian/patches/config-ml.diff +++ b/debian/patches/config-ml.diff @@ -1,8 +1,6 @@ # DP: - Disable some biarch libraries for biarch builds. # DP: - Fix multilib builds on kernels which don't support all multilibs. -Index: b/src/config-ml.in -=================================================================== --- a/src/config-ml.in +++ b/src/config-ml.in @@ -475,6 +475,25 @@ powerpc*-*-* | rs6000*-*-*) @@ -31,7 +29,7 @@ Index: b/src/config-ml.in # Remove extraneous blanks from multidirs. # Tests like `if [ -n "$multidirs" ]' require it. multidirs=`echo "$multidirs" | sed -e 's/^[ ][ ]*//' -e 's/[ ][ ]*$//' -e 's/[ ][ ]*/ /g'` -@@ -891,9 +910,20 @@ if [ -n "${multidirs}" ] && [ -z "${ml_n +@@ -877,9 +896,19 @@ if [ -n "${multidirs}" ] && [ -z "${ml_n fi fi @@ -41,7 +39,6 @@ Index: b/src/config-ml.in + case $arg in + *CC=*) ml_configure_args=${ml_config_env} ;; + *CXX=*) ml_configure_args=${ml_config_env} ;; -+ *GCJ=*) ml_configure_args=${ml_config_env} ;; + *) ;; + esac + done |