Skip to content

Commit

Permalink
Fix cx_paths and autoinclude tests
Browse files Browse the repository at this point in the history
  • Loading branch information
Fyren authored and dvander committed May 24, 2024
1 parent 03aa2e0 commit 0952a7f
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions tests/autoinclude/AMBuildScript
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# vim: set ts=8 sts=2 tw=99 et ft=python:
import os, sys

builder.DetectCompilers()
builder.DetectCxx()

argv = [
sys.executable,
Expand All @@ -23,7 +23,7 @@ cmd_node, (output_header,) = builder.AddCommand(
outputs = outputs
)

program = builder.compiler.Library("hello")
program = builder.cxx.Library("hello")
program.compiler.includes += [builder.buildPath]
program.compiler.sourcedeps += [output_header]
program.sources = [
Expand Down
8 changes: 4 additions & 4 deletions tests/cx_paths/AMBuildScript
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# vim: set sts=2 ts=8 sw=2 tw=99 et ft=python:
builder.DetectCompilers()
if builder.compiler.family == 'gcc':
builder.compiler.cflags += [
builder.DetectCxx()
if builder.cxx.family == 'gcc':
builder.cxx.cflags += [
'-Wall',
'-Werror'
]

builder.RunBuildScript('helper/helper.ambuild')
builder.Build('helper/helper.ambuild')
2 changes: 1 addition & 1 deletion tests/cx_paths/helper/helper.ambuild
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# vim: set sts=2 ts=8 sw=2 tw=99 et ft=python:

builder.RunBuildScript('/program.ambuild')
builder.Build('/program.ambuild')
2 changes: 1 addition & 1 deletion tests/cx_paths/program.ambuild
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# vim: set sts=2 ts=8 sw=2 tw=99 et ft=python:
program = builder.compiler.Program('sample')
program = builder.cxx.Program('sample')
program.sources += [
'main.cpp',
]
Expand Down

0 comments on commit 0952a7f

Please sign in to comment.