diff options
| author | Karen Arutyunov <karen@codesynthesis.com> | 2016-12-02 01:22:47 +0300 |
|---|---|---|
| committer | Karen Arutyunov <karen@codesynthesis.com> | 2016-12-02 01:22:47 +0300 |
| commit | 3395280a4f4b6a31fc5c6bbf0ff686b8b9bd010e (patch) | |
| tree | 3fea692e139ab6df741c6fae335becf5ac120836 | |
| parent | 8749eeea8723196fa38a9eb7917775cfe8b87ad7 (diff) | |
Adapt buildfiles to expansion change
| -rw-r--r-- | build/root.build | 2 | ||||
| -rw-r--r-- | tests/pkg/1/build2.org/common/hello/libhello-1.0.0.tar.gz | bin | 2424 -> 2434 bytes | |||
| -rw-r--r-- | tests/pkg/1/build2.org/common/libhello-1.0.0/hello/buildfile | 4 | ||||
| -rwxr-xr-x | tests/test.sh | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/build/root.build b/build/root.build index 85d5de4..cab3bf1 100644 --- a/build/root.build +++ b/build/root.build @@ -11,7 +11,7 @@ ixx{*}: extension = ixx txx{*}: extension = txx cxx{*}: extension = cxx -cxx.poptions =+ -I$out_root -I$src_root +cxx.poptions =+ "-I$out_root" "-I$src_root" # Load the cli module but only if it's available. This way a distribution # that includes pre-generated files can be built without installing cli. diff --git a/tests/pkg/1/build2.org/common/hello/libhello-1.0.0.tar.gz b/tests/pkg/1/build2.org/common/hello/libhello-1.0.0.tar.gz Binary files differindex de9d167..aec0ff0 100644 --- a/tests/pkg/1/build2.org/common/hello/libhello-1.0.0.tar.gz +++ b/tests/pkg/1/build2.org/common/hello/libhello-1.0.0.tar.gz diff --git a/tests/pkg/1/build2.org/common/libhello-1.0.0/hello/buildfile b/tests/pkg/1/build2.org/common/libhello-1.0.0/hello/buildfile index 8331a7b..bff7fce 100644 --- a/tests/pkg/1/build2.org/common/libhello-1.0.0/hello/buildfile +++ b/tests/pkg/1/build2.org/common/libhello-1.0.0/hello/buildfile @@ -8,11 +8,11 @@ if $abi_prerelease else lib{hello}: bin.lib.version = @-$abi_major.$abi_minor -cxx.poptions += -I$src_root +cxx.poptions += "-I$src_root" obja{*}: cxx.poptions += -DLIBHELLO_STATIC_BUILD objs{*}: cxx.poptions += -DLIBHELLO_SHARED_BUILD -lib{hello}: cxx.export.poptions = -I$src_root +lib{hello}: cxx.export.poptions = "-I$src_root" liba{hello}: cxx.export.poptions += -DLIBHELLO_STATIC libs{hello}: cxx.export.poptions += -DLIBHELLO_SHARED diff --git a/tests/test.sh b/tests/test.sh index 7b2fdf2..debf8f9 100755 --- a/tests/test.sh +++ b/tests/test.sh @@ -323,7 +323,7 @@ email: hello-users@example.org requires: c++11 requires: build2 >= 0.4.0 location: libhello-1.0.0.tar.gz -sha256sum: 4d3f26addc718eb186192edc50b0c60b4eda3da92ebb4537b3f187206a260f12 +sha256sum: 1c1c4fe4eed33d6eb46db62d6273f821580df79bf7e939f5a481a95ef248c784 EOF ## |