@@ -97,7 +97,7 @@ function patch_source {
97
97
for f in $( ls ../patches) ; do
98
98
echo applying patch $f
99
99
git apply ../patches/$f
100
- done
100
+ done
101
101
}
102
102
103
103
function do_build_lib {
@@ -119,34 +119,34 @@ function do_build_lib {
119
119
case $( get_os) -$plat in
120
120
Linux-x86_64)
121
121
local bitness=64
122
- local target_flags= " TARGET= PRESCOTT"
122
+ local target= " PRESCOTT"
123
123
local dynamic_list=" PRESCOTT NEHALEM SANDYBRIDGE HASWELL SKYLAKEX"
124
124
;;
125
125
Darwin-x86_64)
126
126
local bitness=64
127
- local target_flags= " TARGET= CORE2"
127
+ local target= " CORE2"
128
128
# Pick up the gfortran runtime libraries
129
129
export DYLD_LIBRARY_PATH=/usr/local/lib:$DYLD_LIBRARY_PATH
130
130
;;
131
131
* -i686)
132
132
local bitness=32
133
- local target_flags= " TARGET= PRESCOTT"
133
+ local target= " PRESCOTT"
134
134
local dynamic_list=" PRESCOTT NEHALEM SANDYBRIDGE HASWELL"
135
135
;;
136
136
Linux-aarch64)
137
137
local bitness=64
138
- local target_flags= " TARGET= ARMV8"
138
+ local target= " ARMV8"
139
139
;;
140
140
Darwin-arm64)
141
141
local bitness=64
142
- local target_flags= " TARGET= VORTEX"
142
+ local target= " VORTEX"
143
143
;;
144
144
* -s390x)
145
145
local bitness=64
146
146
;;
147
147
* -ppc64le)
148
148
local bitness=64
149
- local target_flags= " TARGET= POWER8"
149
+ local target= " POWER8"
150
150
;;
151
151
* ) echo " Strange plat value $plat " ; exit 1 ;;
152
152
esac
@@ -172,20 +172,18 @@ function do_build_lib {
172
172
echo start building
173
173
if [ -v dynamic_list ]; then
174
174
CFLAGS=" $CFLAGS -fvisibility=protected -Wno-uninitialized" \
175
- make BUFFERSIZE=20 DYNAMIC_ARCH=1 \
175
+ make BUFFERSIZE=20 DYNAMIC_ARCH=1 QUIET_MAKE=1 \
176
176
USE_OPENMP=0 NUM_THREADS=64 \
177
177
DYNAMIC_LIST=" $dynamic_list " \
178
- BINARY=$bitness $interface_flags $target_flags shared 2>&1 1> /dev/null
178
+ BINARY=" $bitness " $interface_flags \
179
+ TARGET=" $target "
179
180
else
180
181
CFLAGS=" $CFLAGS -fvisibility=protected -Wno-uninitialized" \
181
- make BUFFERSIZE=20 DYNAMIC_ARCH=1 \
182
+ make BUFFERSIZE=20 DYNAMIC_ARCH=1 QUIET_MAKE=1 \
182
183
USE_OPENMP=0 NUM_THREADS=64 \
183
- BINARY=$bitness $interface_flags $target_flags shared 2>&1 1> /dev/null
184
+ BINARY=" $bitness " $interface_flags \
185
+ TARGET=" $target "
184
186
fi
185
- echo done building, now testing
186
- make BUFFERSIZE=20 DYNAMIC_ARCH=1 \
187
- USE_OPENMP=0 NUM_THREADS=64 \
188
- BINARY=$bitness $interface_flags $target_flags tests
189
187
make PREFIX=$BUILD_PREFIX $interface_flags install
190
188
popd
191
189
if [ " $nightly " = " 1" ]; then
0 commit comments