summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-03-13 21:43:08 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-03-13 21:43:08 +0100
commitb176023392360f28c0c8964a10effbc9a1f36c04 (patch)
treeb9e0650f3c0053f2c8f85c81be5c05adeeb441e5
parentfcf0789a96777d79d20290e08bf43943a5619387 (diff)
parentb8ea351b0e154c9dc28609db58eddc6c2934c954 (diff)
downloadlinux-exynos-b176023392360f28c0c8964a10effbc9a1f36c04.tar.gz
linux-exynos-b176023392360f28c0c8964a10effbc9a1f36c04.tar.bz2
linux-exynos-b176023392360f28c0c8964a10effbc9a1f36c04.zip
Merge branch 'pm-tools'
* pm-tools: Revert "cpupower Makefile change to help run the tool without 'make install'"
-rw-r--r--tools/power/cpupower/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/power/cpupower/Makefile b/tools/power/cpupower/Makefile
index 3ed7c0476d48..2e2ba2efa0d9 100644
--- a/tools/power/cpupower/Makefile
+++ b/tools/power/cpupower/Makefile
@@ -209,7 +209,7 @@ $(OUTPUT)%.o: %.c
$(OUTPUT)cpupower: $(UTIL_OBJS) $(OUTPUT)libcpupower.so.$(LIB_MAJ)
$(ECHO) " CC " $@
- $(QUIET) $(CC) $(CFLAGS) $(LDFLAGS) $(UTIL_OBJS) -lcpupower -Wl,-rpath=./ -lrt -lpci -L$(OUTPUT) -o $@
+ $(QUIET) $(CC) $(CFLAGS) $(LDFLAGS) $(UTIL_OBJS) -lcpupower -lrt -lpci -L$(OUTPUT) -o $@
$(QUIET) $(STRIPCMD) $@
$(OUTPUT)po/$(PACKAGE).pot: $(UTIL_SRC)