equal
deleted
inserted
replaced
127 def set_options(opt): |
127 def set_options(opt): |
128 # options provided by the modules |
128 # options provided by the modules |
129 opt.tool_options('compiler_cc') |
129 opt.tool_options('compiler_cc') |
130 opt.tool_options('compiler_cxx') |
130 opt.tool_options('compiler_cxx') |
131 opt.tool_options('cflags') |
131 opt.tool_options('cflags') |
|
132 opt.tool_options('gnu_dirs') |
132 |
133 |
133 opt.add_option('--cwd', |
134 opt.add_option('--cwd', |
134 help=('Set the working directory for a program.'), |
135 help=('Set the working directory for a program.'), |
135 action="store", type="string", default=None, |
136 action="store", type="string", default=None, |
136 dest='cwd_launch') |
137 dest='cwd_launch') |
268 try: |
269 try: |
269 conf.check_tool('pkgconfig', ['waf-tools']) |
270 conf.check_tool('pkgconfig', ['waf-tools']) |
270 except Configure.ConfigurationError: |
271 except Configure.ConfigurationError: |
271 pass |
272 pass |
272 conf.check_tool('command', ['waf-tools']) |
273 conf.check_tool('command', ['waf-tools']) |
|
274 conf.check_tool('gnu_dirs') |
|
275 |
|
276 #if os.path.exists('/usr/lib64'): |
|
277 # conf.env.LIBDIR = os.path.join(conf.env.PREFIX, "lib64") |
273 |
278 |
274 # create the second environment, set the variant and set its name |
279 # create the second environment, set the variant and set its name |
275 variant_env = conf.env.copy() |
280 variant_env = conf.env.copy() |
276 variant_name = Options.options.build_profile |
281 variant_name = Options.options.build_profile |
277 |
282 |