Commit b368188a authored by earthdok@chromium.org's avatar earthdok@chromium.org

Instrumented libraries: do not assume that "." is not in PATH.

BUG=389216, 313751
TBR=glider@chromium.org
NOTRY=true

Review URL: https://codereview.chromium.org/392713002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@282991 0039d316-1c4b-4281-b951-d872f2087c98
parent a45355a5
......@@ -8,7 +8,7 @@ diff -rupN ./gdk-pixbuf/Makefile.am ../gdk-pixbuf-2.26.1-patched/gdk-pixbuf/Make
- $(top_builddir)/gdk-pixbuf/gdk-pixbuf-query-loaders $$LOADERS > ./loaders.cache ;\
+ # Use the system-installed gdk-pixbuf-query-loaders. The just-built one \
+ # won't work. \
+ gdk-pixbuf-query-loaders $$LOADERS > ./loaders.cache ;\
+ /usr/bin/gdk-pixbuf-query-loaders $$LOADERS > ./loaders.cache ;\
else \
echo "No dynamic modules found; will use only static modules for uninstalled example programs."; \
touch loaders.cache; \
......@@ -35,7 +35,7 @@ diff -rupN ./gtk/Makefile.am ../gtk+2.0-2.24.10-patched/gtk/Makefile.am
+# just-built one cannot be used because it doesn't have the right RPATH set.
gtk_update_icon_cache_program = \
- ./gtk-update-icon-cache
+ gtk-update-icon-cache
+ /usr/bin/gtk-update-icon-cache
endif
gtkbuiltincache.h: @REBUILD@ stamp-icons
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment