X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;ds=sidebyside;f=tools%2Flttng-gen-tp;h=b62cd9907618207de72604e947a3b0ab11df9558;hb=fcb63a2a653c223f557d39777ca7eaeb03ab6e5f;hp=1b8439f3c71258bfaac2b3bd29358904401800f6;hpb=177d5e84ca824cd51c41cc380b0f7600e27e39a6;p=lttng-ust.git

diff --git a/tools/lttng-gen-tp b/tools/lttng-gen-tp
index 1b8439f3..b62cd990 100755
--- a/tools/lttng-gen-tp
+++ b/tools/lttng-gen-tp
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 #
 # Copyright (c)  2012 Yannick Brosseau <yannick.brosseau@gmail.com>
 #
@@ -94,7 +94,7 @@ class ObjFile:
         if 'CC' in os.environ:
             cc = os.environ['CC']
             try:
-                subprocess.call(cc,
+                subprocess.call(cc.split(),
                                 stdout=subprocess.PIPE,
                                 stderr=subprocess.PIPE)
             except OSError as msg:
@@ -130,12 +130,20 @@ class ObjFile:
         cc = self._detectCC()
         if cc == "":
             raise RuntimeError("No C Compiler detected")
+        if 'CPPFLAGS' in os.environ:
+            cppflags = " " + os.environ['CPPFLAGS']
+        else:
+            cppflags = ""
         if 'CFLAGS' in os.environ:
-            cflags = os.environ['CFLAGS']
+            cflags = " " + os.environ['CFLAGS']
         else:
             cflags = ""
+        if 'LDFLAGS' in os.environ:
+            ldflags = " " + os.environ['LDFLAGS']
+        else:
+            ldflags = ""
 
-        command = cc + " -c " + cflags + " -I. -llttng-ust" + " -o " + self.outputFilename + " " + cFilename
+        command = cc + " -c" + cppflags + cflags + ldflags + " -I. -llttng-ust" + " -o " + self.outputFilename + " " + cFilename
         if verbose:
             print("Compile command: " + command)
         subprocess.call(command.split())