Updated the CentOS 6 Docker build for RocksJava to a newer GCC toolchain (#4756)
Summary: Uses a newer build toolchain but the same old GLIBC when building releases of RocksJava for Linux x64 in the Docker Container. Pull Request resolved: https://github.com/facebook/rocksdb/pull/4756 Differential Revision: D13383575 Pulled By: sagar0 fbshipit-source-id: 27c58814876e434d5fa61395e6664cfc5f6830b1
This commit is contained in:
parent
0463f61837
commit
4048762cbe
@ -1,6 +1,7 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
set -e
|
set -e
|
||||||
|
#set -x
|
||||||
|
|
||||||
rm -rf /rocksdb-local
|
rm -rf /rocksdb-local
|
||||||
cp -r /rocksdb-host /rocksdb-local
|
cp -r /rocksdb-host /rocksdb-local
|
||||||
@ -8,11 +9,19 @@ cd /rocksdb-local
|
|||||||
|
|
||||||
# Use scl devtoolset if available (i.e. CentOS <7)
|
# Use scl devtoolset if available (i.e. CentOS <7)
|
||||||
if hash scl 2>/dev/null; then
|
if hash scl 2>/dev/null; then
|
||||||
scl enable devtoolset-2 'make jclean clean'
|
if scl --list | grep -q 'devtoolset-7'; then
|
||||||
scl enable devtoolset-2 'PORTABLE=1 make -j8 rocksdbjavastatic'
|
scl enable devtoolset-7 'make jclean clean'
|
||||||
|
scl enable devtoolset-7 'PORTABLE=1 make -j6 rocksdbjavastatic'
|
||||||
|
elif scl --list | grep -q 'devtoolset-2'; then
|
||||||
|
scl enable devtoolset-2 'make jclean clean'
|
||||||
|
scl enable devtoolset-2 'PORTABLE=1 make -j6 rocksdbjavastatic'
|
||||||
|
else
|
||||||
|
echo "Could not find devtoolset"
|
||||||
|
exit 1;
|
||||||
|
fi
|
||||||
else
|
else
|
||||||
make jclean clean
|
make jclean clean
|
||||||
PORTABLE=1 make -j8 rocksdbjavastatic
|
PORTABLE=1 make -j6 rocksdbjavastatic
|
||||||
fi
|
fi
|
||||||
|
|
||||||
cp java/target/librocksdbjni-linux*.so java/target/rocksdbjni-*-linux*.jar /rocksdb-host/java/target
|
cp java/target/librocksdbjni-linux*.so java/target/rocksdbjni-*-linux*.jar /rocksdb-host/java/target
|
||||||
|
Loading…
x
Reference in New Issue
Block a user