Skip to content

Commit

Permalink
fix bad rebase merge
Browse files Browse the repository at this point in the history
  • Loading branch information
mattip committed Jul 30, 2024
1 parent e4ce534 commit e9a7924
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions tools/build_steps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -129,14 +129,14 @@ function do_build_lib {
;;
Darwin-x86_64)
local bitness=64
local target_flags=CORE2
local target=CORE2
local dynamic_list="CORE2 NEHALEM SANDYBRIDGE HASWELL SKYLAKEX"
# Pick up the gfortran runtime libraries
export DYLD_LIBRARY_PATH=/usr/local/lib:$DYLD_LIBRARY_PATH
;;
*-i686)
local bitness=32
local target_flags=PRESCOTT
local target=PRESCOTT
local dynamic_list="PRESCOTT NEHALEM SANDYBRIDGE HASWELL"
;;
Linux-aarch64)
Expand Down Expand Up @@ -183,19 +183,19 @@ function do_build_lib {
make BUFFERSIZE=20 DYNAMIC_ARCH=1 \
USE_OPENMP=0 NUM_THREADS=64 \
DYNAMIC_LIST="$dynamic_list" \
BINARY=$bitness $interface_flags $target_flags shared 2>&1 1>/dev/null
BINARY=$bitness $interface_flags TARGET="$target" shared 2>&1 1>/dev/null
make BUFFERSIZE=20 DYNAMIC_ARCH=1 \
USE_OPENMP=0 NUM_THREADS=64 \
DYNAMIC_LIST="$dynamic_list" \
BINARY=$bitness $interface_flags $target_flags tests
BINARY=$bitness $interface_flags TARGET="$target" tests
else
CFLAGS="$CFLAGS -fvisibility=protected -Wno-uninitialized" \
make BUFFERSIZE=20 DYNAMIC_ARCH=1 \
USE_OPENMP=0 NUM_THREADS=64 \
BINARY=$bitness $interface_flags $target_flags shared 2>&1 1>/dev/null
BINARY=$bitness $interface_flags TARGET="$target" shared 2>&1 1>/dev/null
make BUFFERSIZE=20 DYNAMIC_ARCH=1 \
USE_OPENMP=0 NUM_THREADS=64 \
BINARY=$bitness $interface_flags $target_flags tests
BINARY=$bitness $interface_flags TARGET="$target" tests
fi
make PREFIX=$BUILD_PREFIX $interface_flags install
popd
Expand Down

0 comments on commit e9a7924

Please sign in to comment.