remove configure.ac hack where supposed arguments are spliced out of CXX into CXXFLAGS
This commit is contained in:
parent
8ed17ab311
commit
819a9b0943
|
@ -0,0 +1 @@
|
||||||
|
@CXX@
|
|
@ -64,6 +64,20 @@ try:
|
||||||
except:
|
except:
|
||||||
ldflags = None
|
ldflags = None
|
||||||
|
|
||||||
|
# this is to pull out compiler arguments from the CXX flags set up by the
|
||||||
|
# configure script. Specifically, the -std=c++11 flag is added to CXX and here
|
||||||
|
# we pull out everything starting from the first flag (i.e. something starting
|
||||||
|
# with a '-'). The actual command to call the compiler may be more than one
|
||||||
|
# word, for instance "ccache g++".
|
||||||
|
try:
|
||||||
|
with open('compile_cmd') as _file:
|
||||||
|
cmd = _file.read().split(' ')
|
||||||
|
while len(cmd) > 0 and not cmd[0].startswith('-'):
|
||||||
|
cmd = cmd[1:]
|
||||||
|
extra_cmd += ' '.join(cmd)
|
||||||
|
except:
|
||||||
|
pass
|
||||||
|
|
||||||
ext = None
|
ext = None
|
||||||
packages = None
|
packages = None
|
||||||
|
|
||||||
|
|
|
@ -123,8 +123,6 @@ AS_ECHO "Checking for boost libraries:"
|
||||||
AX_BOOST_BASE([1.54])
|
AX_BOOST_BASE([1.54])
|
||||||
|
|
||||||
AX_CXX_COMPILE_STDCXX_11([noext], [mandatory])
|
AX_CXX_COMPILE_STDCXX_11([noext], [mandatory])
|
||||||
# Also put any flags added to CXX into CXXFLAGS
|
|
||||||
CXXFLAGS="$CXXFLAGS $(echo "$CXX " | cut -d ' ' -f 2-)"
|
|
||||||
|
|
||||||
AX_BOOST_SYSTEM()
|
AX_BOOST_SYSTEM()
|
||||||
AS_IF([test -z "$BOOST_SYSTEM_LIB"],
|
AS_IF([test -z "$BOOST_SYSTEM_LIB"],
|
||||||
|
@ -552,6 +550,7 @@ AC_CONFIG_FILES(
|
||||||
[bindings/python/Makefile]
|
[bindings/python/Makefile]
|
||||||
[bindings/python/link_flags]
|
[bindings/python/link_flags]
|
||||||
[bindings/python/compile_flags]
|
[bindings/python/compile_flags]
|
||||||
|
[bindings/python/compile_cmd]
|
||||||
[libtorrent-rasterbar.pc]
|
[libtorrent-rasterbar.pc]
|
||||||
[libtorrent-rasterbar-cmake.pc]
|
[libtorrent-rasterbar-cmake.pc]
|
||||||
)
|
)
|
||||||
|
|
Loading…
Reference in New Issue