From 3251428d9667dd04aaac90bc3500ea617ccac336 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torbj=C3=B6rn=20Rathsman?= Date: Wed, 9 Mar 2022 20:50:04 +0100 Subject: [PATCH] Update integration test and fix bugs --- integration_test/main.sh | 2 +- recipes/cxx_compiler.py | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/integration_test/main.sh b/integration_test/main.sh index 89256b6..0554db9 100755 --- a/integration_test/main.sh +++ b/integration_test/main.sh @@ -5,7 +5,7 @@ set -e export install_dir=$(mktemp -d) trap "rm -rf $install_dir" EXIT -bootsrap_from_version="2.0.0-beta-9" integration_test/bootstrap_from_release.sh +bootsrap_from_version="2.0.0-beta-11" integration_test/bootstrap_from_release.sh target_dir=__targets integration_test/build_new_version.sh exit_status=0 diff --git a/recipes/cxx_compiler.py b/recipes/cxx_compiler.py index a54bd3a..bbb6098 100755 --- a/recipes/cxx_compiler.py +++ b/recipes/cxx_compiler.py @@ -16,21 +16,21 @@ def eprint(*args, **kwargs): print(*args, file=sys.stderr, **kwargs) -def format_iquote(src_dir, target_dir, list): +def format_iquote(src_dir, target_dir, dirs): ret = [] - for item in list: + for item in dirs: if src_dir == '.': ret.append('-iquote%s'%(item)) - ret.append('-iquote%s/%s'%(target_dir,item)) else: ret.append('-iquote%s/%s'%(src_dir, item)) - ret.append('-iquote%s/%s/%s'%(src_dir, target_dir,item)) + + ret.append('-iquote%s/%s/%s'%(os.getcwd(), target_dir, item)) return ret def collect_cflags(src_dir, target_dir, src_file_dir, compiler_flags, dependencies): tmp = [] tmp.extend(compiler_flags['cflags']) - iquote = [src_file_dir] + iquote = [os.path.relpath(src_file_dir, src_dir)] iquote.extend(compiler_flags['iquote']) tmp.extend(format_iquote(src_dir, target_dir, iquote)) for item in dependencies: