Browse Source

waf: fix lib link check

-llibrary_name is already part of the link flags at this point and
libname is "liblibrary_name" so it adds -lliblibrary_name instead which
is wrong
master
Julien Beraud 6 years ago committed by Lucas De Marchi
parent
commit
8a4553ba0a
  1. 5
      Tools/ardupilotwaf/cxx_checks.py

5
Tools/ardupilotwaf/cxx_checks.py

@ -140,7 +140,7 @@ def ap_common_checks(cfg): @@ -140,7 +140,7 @@ def ap_common_checks(cfg):
msg="Checking for HAVE_MEMRCHR",
mandatory=False,
)
@conf
def check_librt(cfg, env):
if cfg.env.DEST_OS == 'darwin':
@ -186,7 +186,6 @@ def check_package(cfg, env, libname): @@ -186,7 +186,6 @@ def check_package(cfg, env, libname):
fragment='''int main() { return 0; }''',
msg='Checking link with %s' % libname,
mandatory=False,
lib=libname,
use=capsname):
cfg.env.revert()
return False
@ -248,7 +247,7 @@ def check_SFML(cfg, env): @@ -248,7 +247,7 @@ def check_SFML(cfg, env):
global_define=True):
cfg.fatal("Missing SFML libraries - please install libsfml-dev")
return False
# see if we need Graphics.hpp or Graphics.h
if not cfg.check(compiler='cxx',
fragment='''#include <SFML/Graphics.hpp>\nint main() {}''', define_name="HAVE_SFML_GRAPHICS_HPP",

Loading…
Cancel
Save