diff options
| -rw-r--r-- | .github/workflows/build-test.yml | 2 | ||||
| -rw-r--r-- | src/main.cc | 6 | ||||
| -rwxr-xr-x | test/dist.sh | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index 1b4c9441..07940dd8 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -35,4 +35,4 @@ jobs: run: cd unpack/colm-* && make - name: test the dist - run: cd unpack/colm--*/test && ./runtests + run: cd unpack/colm-*/test && ./runtests diff --git a/src/main.cc b/src/main.cc index a3a7d2c9..5d6cbac4 100644 --- a/src/main.cc +++ b/src/main.cc @@ -485,7 +485,7 @@ void compileOutput( const char *argv0, const bool inSource, char *srcLocation ) " -I%s/../aapl" " -I%s/include" " -L%s" - " -Wl,-rpath,%s", + " %s/libcolm.a", binaryFn, intermedFn, srcLocation, srcLocation, location, location ); } @@ -510,7 +510,9 @@ void compileOutput( const char *argv0, const bool inSource, char *srcLocation ) strcat( command, " -L" ); strcat( command, *lp ); } - strcat( command, " -lcolm" ); + + if ( !inSource ) + strcat( command, " -lcolm" ); if( !compileOutputCommand( command ) && run ) runOutputProgram(); diff --git a/test/dist.sh b/test/dist.sh index 823d16f9..738a7938 100755 --- a/test/dist.sh +++ b/test/dist.sh @@ -10,7 +10,7 @@ trap "rm -f $DIST" EXIT make dist WORKDIR=`mktemp -d /tmp/colm.XXXXXX` -#trap "rm -Rf $DIST $WORKDIR" EXIT +trap "rm -Rf $DIST $WORKDIR" EXIT tar -C $WORKDIR -xzvf $DIST cd $WORKDIR/${DIST%.tar.gz} |