Index: tools/generate_library_loader/generate_library_loader.py |
diff --git a/tools/generate_library_loader/generate_library_loader.py b/tools/generate_library_loader/generate_library_loader.py |
index edf0706a76a8d56301ba07f7f67f11781edf24a1..07e8a092a13129d2bb5777238e352345ee4b12ff 100755 |
--- a/tools/generate_library_loader/generate_library_loader.py |
+++ b/tools/generate_library_loader/generate_library_loader.py |
@@ -146,6 +146,7 @@ def main(): |
parser.add_option('--output-h') |
parser.add_option('--header') |
+ parser.add_option('--bundled-header') |
parser.add_option('--use-extern-c', action='store_true', default=False) |
parser.add_option('--link-directly', type=int, default=0) |
@@ -190,7 +191,10 @@ def main(): |
'unique_prefix': unique_prefix |
}) |
- wrapped_header_include = '#include %s' % options.header |
+ header = options.header |
+ if options.link_directly == 0 and options.bundled_header: |
+ header = options.bundled_header |
+ wrapped_header_include = '#include %s\n' % header |
# Some libraries (e.g. libpci) have headers that cannot be included |
# without extern "C", otherwise they cause the link to fail. |