diff options
| -rw-r--r-- | distro-configs/Jenkins/Linux_bisect | 2 | ||||
| -rw-r--r-- | distro-configs/Jenkins/Linux_dev_master.conf | 2 | ||||
| -rw-r--r-- | distro-configs/Jenkins/Linux_rel_master.conf | 2 | ||||
| -rw-r--r-- | distro-configs/Jenkins/android_common.conf | 2 | ||||
| -rw-r--r-- | distro-configs/Jenkins/linux_gcc_release_64 | 2 |
5 files changed, 0 insertions, 10 deletions
diff --git a/distro-configs/Jenkins/Linux_bisect b/distro-configs/Jenkins/Linux_bisect index 1992b82bf454..92678cfdea8f 100644 --- a/distro-configs/Jenkins/Linux_bisect +++ b/distro-configs/Jenkins/Linux_bisect @@ -1,5 +1,3 @@ -CC=/opt/rh/devtoolset-7/root/usr/bin/gcc -CXX=/opt/rh/devtoolset-7/root/usr/bin/g++ --disable-werror --disable-odk --with-jdk-home=/etc/alternatives/java_sdk_11 diff --git a/distro-configs/Jenkins/Linux_dev_master.conf b/distro-configs/Jenkins/Linux_dev_master.conf index dcff6189cd85..d4b221fe0c06 100644 --- a/distro-configs/Jenkins/Linux_dev_master.conf +++ b/distro-configs/Jenkins/Linux_dev_master.conf @@ -1,6 +1,4 @@ --enable-dbgutil --enable-kf5 --with-jdk-home=/etc/alternatives/java_sdk_11 -CC=/opt/rh/devtoolset-7/root/usr/bin/gcc -CXX=/opt/rh/devtoolset-7/root/usr/bin/g++ --enable-odk diff --git a/distro-configs/Jenkins/Linux_rel_master.conf b/distro-configs/Jenkins/Linux_rel_master.conf index 150bf7df1f6e..5e280bbf4aa8 100644 --- a/distro-configs/Jenkins/Linux_rel_master.conf +++ b/distro-configs/Jenkins/Linux_rel_master.conf @@ -1,5 +1,3 @@ --enable-kf5 --with-jdk-home=/etc/alternatives/java_sdk_11 -CC=/opt/rh/devtoolset-7/root/usr/bin/gcc -CXX=/opt/rh/devtoolset-7/root/usr/bin/g++ --enable-odk diff --git a/distro-configs/Jenkins/android_common.conf b/distro-configs/Jenkins/android_common.conf index 54af74b3450a..51ae8e255ee5 100644 --- a/distro-configs/Jenkins/android_common.conf +++ b/distro-configs/Jenkins/android_common.conf @@ -2,6 +2,4 @@ --with-android-ndk=$HOME/Android/Sdk/ndk/25.1.8937393 --with-jdk-home=/etc/alternatives/java_sdk_11 --enable-android-editing -CC_FOR_BUILD=/opt/rh/devtoolset-7/root/usr/bin/gcc -CXX_FOR_BUILD=/opt/rh/devtoolset-7/root/usr/bin/g++ --enable-odk diff --git a/distro-configs/Jenkins/linux_gcc_release_64 b/distro-configs/Jenkins/linux_gcc_release_64 index c4b24f68b007..3057f58227af 100644 --- a/distro-configs/Jenkins/linux_gcc_release_64 +++ b/distro-configs/Jenkins/linux_gcc_release_64 @@ -1,5 +1,3 @@ -CC=/opt/rh/devtoolset-7/root/usr/bin/gcc -CXX=/opt/rh/devtoolset-7/root/usr/bin/g++ --enable-kf5 --disable-dependency-tracking --with-jdk-home=/etc/alternatives/java_sdk_11 |