Skip to content

Commit

Permalink
Merge branch 'fix-release'
Browse files Browse the repository at this point in the history
  • Loading branch information
Falldog committed Feb 13, 2022
2 parents 25307f5 + cebbc7b commit 61f88c9
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
2 changes: 1 addition & 1 deletion pyconcrete-admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ def parse_arg(self):
else:
try:
args = parser.parse_args()
self.verbose = args.verbose or IS_TEST_VERBOSE
self.verbose = getattr(args, 'verbose', False) or IS_TEST_VERBOSE
args.func(args)
except PyConcreteError as e:
print('Error: ' + str(e))
Expand Down
6 changes: 2 additions & 4 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
import hashlib
import imp
import os
import subprocess
import sys
import sysconfig
from distutils.command.build import build
Expand Down Expand Up @@ -359,9 +358,8 @@ def get_exe_link_args():

# add -Lxxxx for link correct lib -lpython3.x
if is_mac():
ldflags = subprocess.check_output('python{ver}-config --ldflags'.format(ver=ver), shell=True)
ldflags = ldflags.decode('utf8')
return [ld for ld in ldflags.split() if ld.startswith('-L')]
if not sysconfig.get_config_var('Py_ENABLE_SHARED'): # reference from `python-config --ldflags`
return ['-L' + sysconfig.get_config_var('LIBPL')]

return None

Expand Down

0 comments on commit 61f88c9

Please sign in to comment.