Move toolchain related configures into one place
This commit is contained in:
parent
ed2103a49f
commit
8e19edd1b5
2 changed files with 27 additions and 29 deletions
|
@ -260,11 +260,5 @@
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
}], # OS=="mac"
|
}], # OS=="mac"
|
||||||
|
|
||||||
['OS=="linux"', {
|
|
||||||
'variables': {
|
|
||||||
'pkg-config': '<(source_root)/tools/linux/pkg-config-wrapper "<(sysroot)" "<(target_arch)" "<(system_libdir)"',
|
|
||||||
},
|
|
||||||
}], # OS=="linux"
|
|
||||||
],
|
],
|
||||||
}
|
}
|
||||||
|
|
|
@ -5,8 +5,6 @@
|
||||||
# Set this to true when building with Clang.
|
# Set this to true when building with Clang.
|
||||||
'clang%': 1,
|
'clang%': 1,
|
||||||
|
|
||||||
'system_libdir%': 'lib',
|
|
||||||
|
|
||||||
'variables': {
|
'variables': {
|
||||||
# The minimum OS X SDK version to use.
|
# The minimum OS X SDK version to use.
|
||||||
'mac_sdk_min%': '10.10',
|
'mac_sdk_min%': '10.10',
|
||||||
|
@ -17,12 +15,8 @@
|
||||||
# Set NEON compilation flags.
|
# Set NEON compilation flags.
|
||||||
'arm_neon%': 1,
|
'arm_neon%': 1,
|
||||||
|
|
||||||
'conditions': [
|
# Abosulte path to source root.
|
||||||
# Define the abosulte version of <(DEPTH).
|
'source_root%': '<!(python <(DEPTH)/tools/atom_source_root.py)',
|
||||||
['OS!="win"', {
|
|
||||||
'source_root%': '<!(cd <(DEPTH) && pwd -P)',
|
|
||||||
}], # OS!="win"
|
|
||||||
],
|
|
||||||
},
|
},
|
||||||
|
|
||||||
# Copy conditionally-set variables out one scope.
|
# Copy conditionally-set variables out one scope.
|
||||||
|
@ -47,21 +41,31 @@
|
||||||
}],
|
}],
|
||||||
|
|
||||||
['OS=="linux"', {
|
['OS=="linux"', {
|
||||||
'conditions': [
|
'variables': {
|
||||||
['target_arch=="arm"', {
|
# The system libdir used for this ABI.
|
||||||
# sysroot needs to be an absolute path otherwise it generates
|
'system_libdir%': 'lib',
|
||||||
# incorrect results when passed to pkg-config
|
|
||||||
'sysroot%': '<(source_root)/vendor/debian_wheezy_arm-sysroot',
|
# Setting the path to sysroot.
|
||||||
}],
|
'conditions': [
|
||||||
['target_arch=="ia32"', {
|
['target_arch=="arm"', {
|
||||||
'sysroot%': '<(source_root)/vendor/debian_wheezy_i386-sysroot',
|
# sysroot needs to be an absolute path otherwise it generates
|
||||||
}],
|
# incorrect results when passed to pkg-config
|
||||||
['target_arch=="x64"', {
|
'sysroot%': '<(source_root)/vendor/debian_wheezy_arm-sysroot',
|
||||||
'sysroot%': '<(source_root)/vendor/debian_wheezy_amd64-sysroot',
|
}],
|
||||||
}],
|
['target_arch=="ia32"', {
|
||||||
],
|
'sysroot%': '<(source_root)/vendor/debian_wheezy_i386-sysroot',
|
||||||
}, {
|
}],
|
||||||
'sysroot%': ' ',
|
['target_arch=="x64"', {
|
||||||
|
'sysroot%': '<(source_root)/vendor/debian_wheezy_amd64-sysroot',
|
||||||
|
}],
|
||||||
|
],
|
||||||
|
},
|
||||||
|
# Copy conditionally-set variables out one scope.
|
||||||
|
'sysroot%': '<(sysroot)',
|
||||||
|
'system_libdir%': '<(system_libdir)',
|
||||||
|
|
||||||
|
# Redirect pkg-config to search from sysroot.
|
||||||
|
'pkg-config%': '<(source_root)/tools/linux/pkg-config-wrapper "<(sysroot)" "<(target_arch)" "<(system_libdir)"',
|
||||||
}],
|
}],
|
||||||
|
|
||||||
# Set default compiler flags depending on ARM version.
|
# Set default compiler flags depending on ARM version.
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue