diff options
| author | Brent Cook <busterb@gmail.com> | 2019-01-20 20:07:54 -0600 |
|---|---|---|
| committer | Brent Cook <busterb@gmail.com> | 2019-01-20 20:07:54 -0600 |
| commit | 0492445a6958d8d7d6b76314b64052ce9e4e762d (patch) | |
| tree | 70340e8ec2c35624ca222524e41a02e9710aaff8 /update.sh | |
| parent | 8730803401f3bdc922def1ca01ea8f1f78aa81db (diff) | |
| download | portable-0492445a6958d8d7d6b76314b64052ce9e4e762d.tar.gz portable-0492445a6958d8d7d6b76314b64052ce9e4e762d.tar.bz2 portable-0492445a6958d8d7d6b76314b64052ce9e4e762d.zip | |
always stop the asm generators from calling the C compiler
Diffstat (limited to 'update.sh')
| -rwxr-xr-x | update.sh | 12 |
1 files changed, 2 insertions, 10 deletions
| @@ -161,11 +161,7 @@ $GREP -v OPENSSL_ia32cap_P $libcrypto_src/Symbols.list | $GREP '^[A-Za-z0-9_]' > | |||
| 161 | # generate assembly crypto algorithms | 161 | # generate assembly crypto algorithms |
| 162 | asm_src=$libcrypto_src | 162 | asm_src=$libcrypto_src |
| 163 | gen_asm_stdout() { | 163 | gen_asm_stdout() { |
| 164 | if [ $1 = "mingw64" ]; then | 164 | CC=true perl $asm_src/$2 $1 > $3.tmp |
| 165 | CC=true perl $asm_src/$2 $1 > $3.tmp | ||
| 166 | else | ||
| 167 | perl $asm_src/$2 $1 > $3.tmp | ||
| 168 | fi | ||
| 169 | [ $1 = "elf" ] && cat <<-EOF >> $3.tmp | 165 | [ $1 = "elf" ] && cat <<-EOF >> $3.tmp |
| 170 | #if defined(HAVE_GNU_STACK) | 166 | #if defined(HAVE_GNU_STACK) |
| 171 | .section .note.GNU-stack,"",%progbits | 167 | .section .note.GNU-stack,"",%progbits |
| @@ -174,11 +170,7 @@ gen_asm_stdout() { | |||
| 174 | $MV $3.tmp $3 | 170 | $MV $3.tmp $3 |
| 175 | } | 171 | } |
| 176 | gen_asm() { | 172 | gen_asm() { |
| 177 | if [ $1 = "mingw64" ]; then | 173 | CC=true perl $asm_src/$2 $1 $3.tmp |
| 178 | CC=true perl $asm_src/$2 $1 $3.tmp | ||
| 179 | else | ||
| 180 | perl $asm_src/$2 $1 $3.tmp | ||
| 181 | fi | ||
| 182 | [ $1 = "elf" ] && cat <<-EOF >> $3.tmp | 174 | [ $1 = "elf" ] && cat <<-EOF >> $3.tmp |
| 183 | #if defined(HAVE_GNU_STACK) | 175 | #if defined(HAVE_GNU_STACK) |
| 184 | .section .note.GNU-stack,"",%progbits | 176 | .section .note.GNU-stack,"",%progbits |