Use correct path for extractor binaries

github · Mar 17, 2023 · efc8b34 · efc8b34
1 parent 292dd63
commit efc8b34
Showing 1 changed file with 11 additions and 3 deletions.
diff --git a/ruby/scripts/create-extractor-pack.sh b/ruby/scripts/create-extractor-pack.sh
@@ -14,13 +14,21 @@ else
 fi
 
 (cd extractor && "$CARGO" build --release)
-extractor/target/release/generator --dbscheme ql/lib/ruby.dbscheme --library ql/lib/codeql/ruby/ast/internal/TreeSitter.qll
+
+# If building via cross, the binaries will be in extractor/target/<triple>/release
+# If building via cargo, the binaries will be in extractor/target/release
+BIN_DIR=extractor/target/release
+if [[ "$CARGO" == "cross" ]]; then
+  BIN_DIR=extractor/target/x86_64-unknown-linux-gnu/release
+fi
+
+"$BIN_DIR/generator" --dbscheme ql/lib/ruby.dbscheme --library ql/lib/codeql/ruby/ast/internal/TreeSitter.qll
 
 codeql query format -i ql/lib/codeql/ruby/ast/internal/TreeSitter.qll
 
 rm -rf extractor-pack
 mkdir -p extractor-pack
 cp -r codeql-extractor.yml downgrades tools ql/lib/ruby.dbscheme ql/lib/ruby.dbscheme.stats extractor-pack/
 mkdir -p extractor-pack/tools/${platform}
-cp extractor/target/release/extractor extractor-pack/tools/${platform}/extractor
-cp extractor/target/release/autobuilder extractor-pack/tools/${platform}/autobuilder
+cp "$BIN_DIR/extractor" extractor-pack/tools/${platform}/extractor
+cp "$BIN_DIR/autobuilder" extractor-pack/tools/${platform}/autobuilder