Attempt to fix the rustpkg build

These changes are modeled after the fancy-lib test code:
https://github.com/mozilla/rust/tree/master/src/librustpkg/testsuite/pass/src/fancy-lib