commit 244fa0c803959c75b0ac3c765380f671665e8a86 parent 39657eb98c5500126bd9d5f28ab1e8a5be4ebc95 Author: Kyle Milz <kyle@getaddrinfo.net> Date: Sun, 3 Apr 2016 23:11:06 -0600 SCV: don't use citrun_wrap anymore - this script is meant to be used from an installed location Diffstat:
M | SCV/Project.pm | | | 14 | +++++++++----- |
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/SCV/Project.pm b/SCV/Project.pm @@ -39,9 +39,6 @@ sub compile { my $src_files = join(" ", @{ $self->{src_files} }); my $jamfile = <<EOF; -LINKFLAGS = \$(LDFLAGS) ; -LINKLIBS = \$(LDADD) ; - Main $self->{prog_name} : $src_files ; EOF # Write Jamfile to temp directory @@ -49,9 +46,16 @@ EOF syswrite( $jamfile_fh, $jamfile ); close( $jamfile_fh ); - # Use the wrapper to make sure it works my $cwd = getcwd; - my $ret = system( "cd $tmp_dir && $cwd/bin/citrun_wrap jam" ); + + $ENV{SCV_PATH} = "$cwd/src/compilers"; + $ENV{PATH} = "$ENV{SCV_PATH}:$ENV{PATH}"; + + # Jam style LDFLAGS and LDADD + $ENV{LINKFLAGS} = "-L$cwd/lib"; + $ENV{LINKLIBS} = "-lcitrun"; + + my $ret = system( "cd $tmp_dir && jam" ); die "make failed: $ret\n" if ($ret); }