diff options
Diffstat (limited to 'WebKitTools/Scripts/run-launcher')
| -rwxr-xr-x | WebKitTools/Scripts/run-launcher | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/WebKitTools/Scripts/run-launcher b/WebKitTools/Scripts/run-launcher index 9680cc2..24a4c32 100755 --- a/WebKitTools/Scripts/run-launcher +++ b/WebKitTools/Scripts/run-launcher @@ -49,11 +49,13 @@ if (isQt()) { my $libDir = catdir(productDir(), 'lib'); $launcherPath = catdir($launcherPath, "bin", "QtLauncher"); - # Set up LD_LIBRARY_PATH to point to the product directory. - print "Starting webkit launcher with LD_LIBRARY_PATH set to point to built WebKit in $libDir.\n"; - - $ENV{LD_LIBRARY_PATH} = $ENV{LD_LIBRARY_PATH} ? "$libDir:$ENV{LD_LIBRARY_PATH}" : $libDir; - $ENV{DYLD_LIBRARY_PATH} = $ENV{DYLD_LIBRARY_PATH} ? "$libDir:$ENV{DYLD_LIBRARY_PATH}" : $libDir; + print "Starting webkit launcher, running against the built WebKit in $libDir...\n"; + if (isDarwin()) { + $ENV{DYLD_LIBRARY_PATH} = $ENV{DYLD_LIBRARY_PATH} ? "$libDir:$ENV{DYLD_LIBRARY_PATH}" : $libDir; + $ENV{DYLD_FRAMEWORK_PATH} = $ENV{DYLD_FRAMEWORK_PATH} ? "$libDir:$ENV{DYLD_FRAMEWORK_PATH}" : $libDir; + } else { + $ENV{LD_LIBRARY_PATH} = $ENV{LD_LIBRARY_PATH} ? "$libDir:$ENV{LD_LIBRARY_PATH}" : $libDir; + } } else { if (isGtk()) { |