Revert "Fix bug when using build-mac.sh and remove cryptoconditions from mac+win build scripts"
This reverts commit 46c738500f.
This commit is contained in:
8
build.sh
8
build.sh
@@ -9,13 +9,11 @@ set -eu -o pipefail
|
|||||||
if [[ "$OSTYPE" == "linux-gnu"* ]]; then
|
if [[ "$OSTYPE" == "linux-gnu"* ]]; then
|
||||||
./util/build.sh --disable-tests $@
|
./util/build.sh --disable-tests $@
|
||||||
elif [[ "$OSTYPE" == "darwin"* ]]; then
|
elif [[ "$OSTYPE" == "darwin"* ]]; then
|
||||||
# code from ./util/build.sh needs to be ported to support --disable-tests
|
./util/build-mac.sh --disable-tests $@
|
||||||
#./util/build-mac.sh --disable-tests $@
|
|
||||||
./util/build-mac.sh $@
|
|
||||||
elif [[ "$OSTYPE" == "msys"* ]]; then
|
elif [[ "$OSTYPE" == "msys"* ]]; then
|
||||||
./util/build-win.sh --disable-tests $@
|
./util/build-win.sh --disable-tests $@
|
||||||
elif [[ "$OSTYPE" == "freebsd"* ]]; then
|
#elif [[ "$OSTYPE" == "freebsd"* ]]; then
|
||||||
./util/build.sh --disable-tests $@
|
# placeholder
|
||||||
else
|
else
|
||||||
echo "Unable to detect your OS. What are you using?"
|
echo "Unable to detect your OS. What are you using?"
|
||||||
fi
|
fi
|
||||||
|
|||||||
@@ -46,6 +46,13 @@ PREFIX="$(pwd)/depends/$TRIPLET"
|
|||||||
|
|
||||||
make "$@" -C ./depends/ V=1 NO_QT=1
|
make "$@" -C ./depends/ V=1 NO_QT=1
|
||||||
|
|
||||||
|
#BUILD CCLIB
|
||||||
|
WD=$PWD
|
||||||
|
cd src/cc
|
||||||
|
echo $PWD
|
||||||
|
./makecustom
|
||||||
|
cd $WD
|
||||||
|
|
||||||
# Build RandomX
|
# Build RandomX
|
||||||
cd src/RandomX
|
cd src/RandomX
|
||||||
if [ -d "build" ]
|
if [ -d "build" ]
|
||||||
|
|||||||
@@ -18,6 +18,13 @@ cd ..
|
|||||||
|
|
||||||
CONFIG_SITE=$PWD/depends/x86_64-w64-mingw32/share/config.site CXXFLAGS="-DPTW32_STATIC_LIB -DCURL_STATICLIB -fopenmp -pthread" ./configure --prefix="${PREFIX}" --host=x86_64-w64-mingw32 --enable-static --disable-shared
|
CONFIG_SITE=$PWD/depends/x86_64-w64-mingw32/share/config.site CXXFLAGS="-DPTW32_STATIC_LIB -DCURL_STATICLIB -fopenmp -pthread" ./configure --prefix="${PREFIX}" --host=x86_64-w64-mingw32 --enable-static --disable-shared
|
||||||
|
|
||||||
|
# Build CryptoConditions stuff
|
||||||
|
WD=$PWD
|
||||||
|
cd src/cc
|
||||||
|
echo $PWD
|
||||||
|
./makecustom
|
||||||
|
cd $WD
|
||||||
|
|
||||||
# Build RandomX
|
# Build RandomX
|
||||||
cd src/RandomX
|
cd src/RandomX
|
||||||
if [ -d "build" ]
|
if [ -d "build" ]
|
||||||
|
|||||||
Reference in New Issue
Block a user