diff --git a/script/build-external-libs/build-libsodium.sh b/script/build-external-libs/build-libsodium.sh index 19462d7..e5c1d6c 100755 --- a/script/build-external-libs/build-libsodium.sh +++ b/script/build-external-libs/build-libsodium.sh @@ -34,23 +34,17 @@ for arch in ${archs[@]}; do mkdir -p $OUTPUT_DIR echo "building for ${arch}" - PATH=$build_root/tool/$arch/$target_host/bin:$build_root/tool/$arch/bin:$PATH \ - CC=clang CXX=clang++ \ + (PATH=$build_root/tool/$arch/$target_host/bin:$build_root/tool/$arch/bin:$PATH \ + CC=clang CXX=clang++; \ ./configure \ --prefix=${OUTPUT_DIR} \ --host=${target_host} \ --enable-static \ - --disable-shared + --disable-shared \ + && make && make install) - PATH=$build_root/tool/$arch/$target_host/bin:$build_root/tool/$arch/bin:$PATH \ - CC=clang CXX=clang++ \ - make - PATH=$build_root/tool/$arch/$target_host/bin:$build_root/tool/$arch/bin:$PATH \ - CC=clang CXX=clang++ \ - make install - # ln -sf ./src/libsodium/include $build_root/build/libsodium/$arch done exit 0 diff --git a/script/build-external-libs/wownero/build-all-arch.sh b/script/build-external-libs/wownero/build-all-arch.sh index 92f600e..6b408cb 100755 --- a/script/build-external-libs/wownero/build-all-arch.sh +++ b/script/build-external-libs/wownero/build-all-arch.sh @@ -46,8 +46,6 @@ for arch in ${archs[@]}; do mkdir -p $OUTPUT_DIR cd $OUTPUT_DIR - # CMAKE_INCLUDE_PATH=$build_root/build/libsodium/$arch/include \ - PATH=$build_root/tool/$arch/$target_host/bin:$build_root/tool/$arch/bin:$PATH \ CC=clang CXX=clang++ \ CMAKE_LIBRARY_PATH=$build_root/build/libsodium/$arch/lib \ @@ -72,12 +70,6 @@ for arch in ${archs[@]}; do $extra_cmake_flags \ ../.. - - echo "CMAKE_INCLUDE_PATH: $build_root/build/libsodium/$arch/include" - - # CMAKE_INCLUDE_PATH=$build_root/build/libsodium/$arch/include \ - # CMAKE_LIBRARY_PATH=$build_root/build/libsodium/$arch/lib \ - make -j wallet_api find . -path ./lib -prune -o -name '*.a' -exec cp '{}' lib \;