mirror of
https://git.freebsd.org/ports.git
synced 2025-05-21 03:23:10 -04:00
35 lines
1.1 KiB
Text
35 lines
1.1 KiB
Text
--- SConstruct.orig 2016-08-09 07:52:15 UTC
|
|
+++ SConstruct
|
|
@@ -63,7 +63,7 @@ elif (os.name=="nt"):
|
|
if (os.getenv("VSINSTALLDIR")==None or platform_arg=="android"):
|
|
custom_tools=['mingw']
|
|
|
|
-env_base=Environment(tools=custom_tools);
|
|
+env_base=Environment(tools=custom_tools, ENV = os.environ);
|
|
env_base.AppendENVPath('PATH', os.getenv('PATH'))
|
|
env_base.AppendENVPath('PKG_CONFIG_PATH', os.getenv('PKG_CONFIG_PATH'))
|
|
env_base.global_defaults=global_defaults
|
|
@@ -231,15 +231,17 @@ if selected_platform in platform_list:
|
|
if env["extra_suffix"] != '' :
|
|
env.extra_suffix += '.'+env["extra_suffix"]
|
|
|
|
- CCFLAGS = env.get('CCFLAGS', '')
|
|
- env['CCFLAGS'] = ''
|
|
+ env['CC'] = os.environ['CC']
|
|
+ env['CXX'] = os.environ['CXX']
|
|
+
|
|
+ CFLAGS = os.environ['CFLAGS']
|
|
+ env['CFLAGS'] = []
|
|
+ env.Append(CFLAGS=string.split(str(CFLAGS)))
|
|
|
|
+ CCFLAGS = os.environ['CXXFLAGS']
|
|
+ env['CCFLAGS'] = []
|
|
env.Append(CCFLAGS=string.split(str(CCFLAGS)))
|
|
|
|
- CFLAGS = env.get('CFLAGS', '')
|
|
- env['CFLAGS'] = ''
|
|
-
|
|
- env.Append(CFLAGS=string.split(str(CFLAGS)))
|
|
|
|
LINKFLAGS = env.get('LINKFLAGS', '')
|
|
env['LINKFLAGS'] = ''
|