diff --git a/boost/build.sh b/boost/build.sh index c2d08a0..9bedbb3 100755 --- a/boost/build.sh +++ b/boost/build.sh @@ -1,18 +1,18 @@ #!/bin/bash -boostLibVer=1_70_0 +libVer=1_70_0 -echo boostLibVer=$boostLibVer +echo libVer=$libVer scriptDir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" originalPath=$scriptDir/original buildPath=$scriptDir/build installPath=$scriptDir/install -libFilePath=$originalPath/boost_$boostLibVer.tar.gz -libBuildPath=$buildPath/$boostLibVer -libInstallPath=$installPath/$boostLibVer -libSrcPath=$buildPath/boost_$boostLibVer +libFilePath=$originalPath/boost_$libVer.tar.gz +libBuildPath=$buildPath/$libVer +libInstallPath=$installPath/$libVer +libSrcPath=$buildPath/boost_$libVer echo echo libFilePath=$libFilePath diff --git a/google/benchmark/build.sh b/google/benchmark/build.sh index 54dd320..d44fdf8 100755 --- a/google/benchmark/build.sh +++ b/google/benchmark/build.sh @@ -31,8 +31,8 @@ tar zxvpf $libFilePath -C $buildPath unameOut="$(uname -s)" case "${unameOut}" in - Linux*) ( cd $libBuildPath && cmake -DCMAKE_BUILD_TYPE=Release -DBENCHMARK_DOWNLOAD_DEPENDENCIES=ON -DBENCHMARK_ENABLE_LTO=true -DCMAKE_INSTALL_PREFIX:PATH=$libInstallPath $libSrcPath && make install -j);; - Darwin*) ( cd $libBuildPath && cmake -DCMAKE_BUILD_TYPE=Release -DBENCHMARK_DOWNLOAD_DEPENDENCIES=ON -DBENCHMARK_ENABLE_LTO=true -DCMAKE_INSTALL_PREFIX:PATH=$libInstallPath -DLLVMAR_EXECUTABLE:PATH=/usr/bin/ar -DLLVMNM_EXECUTABLE:PATH=/usr/bin/nm -DLLVMRANLIB_EXECUTABLE:PATH=/usr/bin/ranlib $libSrcPath && make install -j);; + Linux*) ( cd $libBuildPath && cmake -DCMAKE_BUILD_TYPE=Release -DBENCHMARK_DOWNLOAD_DEPENDENCIES=ON -DCMAKE_INSTALL_PREFIX:PATH=$libInstallPath $libSrcPath && make install -j);; + Darwin*) ( cd $libBuildPath && cmake -DCMAKE_BUILD_TYPE=Release -DBENCHMARK_DOWNLOAD_DEPENDENCIES=ON -DCMAKE_INSTALL_PREFIX:PATH=$libInstallPath -DLLVMAR_EXECUTABLE:PATH=/usr/bin/ar -DLLVMNM_EXECUTABLE:PATH=/usr/bin/nm -DLLVMRANLIB_EXECUTABLE:PATH=/usr/bin/ranlib $libSrcPath && make install -j);; CYGWIN*) ;; MINGW*) ;; *) ;; diff --git a/google/benchmark/original/benchmark-1.5.0.tar.gz b/google/benchmark/original/benchmark-1.5.0.tar.gz index 0ddf0d2..6281c4a 100644 Binary files a/google/benchmark/original/benchmark-1.5.0.tar.gz and b/google/benchmark/original/benchmark-1.5.0.tar.gz differ diff --git a/google/log/original/glog-0.4.0.tar.gz b/google/log/original/glog-0.4.0.tar.gz index b229ef3..13c6cb7 100644 Binary files a/google/log/original/glog-0.4.0.tar.gz and b/google/log/original/glog-0.4.0.tar.gz differ diff --git a/google/test/original/googletest-release-1.8.1.tar.gz b/google/test/original/googletest-release-1.8.1.tar.gz index 108bb80..570390f 100644 Binary files a/google/test/original/googletest-release-1.8.1.tar.gz and b/google/test/original/googletest-release-1.8.1.tar.gz differ