| OLD | NEW |
| 1 # Copyright 2012 the V8 project authors. All rights reserved. | 1 # Copyright 2012 the V8 project authors. All rights reserved. |
| 2 # Redistribution and use in source and binary forms, with or without | 2 # Redistribution and use in source and binary forms, with or without |
| 3 # modification, are permitted provided that the following conditions are | 3 # modification, are permitted provided that the following conditions are |
| 4 # met: | 4 # met: |
| 5 # | 5 # |
| 6 # * Redistributions of source code must retain the above copyright | 6 # * Redistributions of source code must retain the above copyright |
| 7 # notice, this list of conditions and the following disclaimer. | 7 # notice, this list of conditions and the following disclaimer. |
| 8 # * Redistributions in binary form must reproduce the above | 8 # * Redistributions in binary form must reproduce the above |
| 9 # copyright notice, this list of conditions and the following | 9 # copyright notice, this list of conditions and the following |
| 10 # disclaimer in the documentation and/or other materials provided | 10 # disclaimer in the documentation and/or other materials provided |
| (...skipping 244 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 255 }], | 255 }], |
| 256 ['OS=="android"', { | 256 ['OS=="android"', { |
| 257 # Location of Android NDK. | 257 # Location of Android NDK. |
| 258 'variables': { | 258 'variables': { |
| 259 'variables': { | 259 'variables': { |
| 260 # The Android toolchain needs to use the absolute path to the NDK | 260 # The Android toolchain needs to use the absolute path to the NDK |
| 261 # because it is used at different levels in the GYP files. | 261 # because it is used at different levels in the GYP files. |
| 262 'android_ndk_root%': '<(base_dir)/third_party/android_tools/ndk/', | 262 'android_ndk_root%': '<(base_dir)/third_party/android_tools/ndk/', |
| 263 'android_host_arch%': "<!(uname -m | sed -e 's/i[3456]86/x86/')", | 263 'android_host_arch%': "<!(uname -m | sed -e 's/i[3456]86/x86/')", |
| 264 'host_os%': "<!(uname -s | sed -e 's/Linux/linux/;s/Darwin/mac/')", | 264 'host_os%': "<!(uname -s | sed -e 's/Linux/linux/;s/Darwin/mac/')", |
| 265 'os_folder_name%': "<!(uname -s | sed -e 's/Linux/linux/;s/Darwin/da
rwin/')", |
| 265 }, | 266 }, |
| 266 | 267 |
| 267 # Copy conditionally-set variables out one scope. | 268 # Copy conditionally-set variables out one scope. |
| 268 'android_ndk_root%': '<(android_ndk_root)', | 269 'android_ndk_root%': '<(android_ndk_root)', |
| 269 'host_os%': '<(host_os)', | 270 'host_os%': '<(host_os)', |
| 271 'os_folder_name%': '<(os_folder_name)', |
| 270 | 272 |
| 271 'conditions': [ | 273 'conditions': [ |
| 272 ['target_arch == "ia32"', { | 274 ['target_arch == "ia32"', { |
| 273 'android_toolchain%': '<(android_ndk_root)/toolchains/x86-4.9/preb
uilt/<(host_os)-<(android_host_arch)/bin', | 275 'android_toolchain%': '<(android_ndk_root)/toolchains/x86-4.9/preb
uilt/<(os_folder_name)-<(android_host_arch)/bin', |
| 274 'android_target_arch%': 'x86', | 276 'android_target_arch%': 'x86', |
| 275 'android_target_platform%': '16', | 277 'android_target_platform%': '16', |
| 278 'arm_version%': 'default', |
| 276 }], | 279 }], |
| 277 ['target_arch == "x64"', { | 280 ['target_arch == "x64"', { |
| 278 'android_toolchain%': '<(android_ndk_root)/toolchains/x86_64-4.9/p
rebuilt/<(host_os)-<(android_host_arch)/bin', | 281 'android_toolchain%': '<(android_ndk_root)/toolchains/x86_64-4.9/p
rebuilt/<(os_folder_name)-<(android_host_arch)/bin', |
| 279 'android_target_arch%': 'x86_64', | 282 'android_target_arch%': 'x86_64', |
| 280 'android_target_platform%': '21', | 283 'android_target_platform%': '21', |
| 284 'arm_version%': 'default', |
| 281 }], | 285 }], |
| 282 ['target_arch=="arm"', { | 286 ['target_arch=="arm"', { |
| 283 'android_toolchain%': '<(android_ndk_root)/toolchains/arm-linux-an
droideabi-4.9/prebuilt/<(host_os)-<(android_host_arch)/bin', | 287 'android_toolchain%': '<(android_ndk_root)/toolchains/arm-linux-an
droideabi-4.9/prebuilt/<(os_folder_name)-<(android_host_arch)/bin', |
| 284 'android_target_arch%': 'arm', | 288 'android_target_arch%': 'arm', |
| 285 'android_target_platform%': '16', | 289 'android_target_platform%': '16', |
| 286 'arm_version%': 7, | 290 'arm_version%': 7, |
| 287 }], | 291 }], |
| 288 ['target_arch == "arm64"', { | 292 ['target_arch == "arm64"', { |
| 289 'android_toolchain%': '<(android_ndk_root)/toolchains/aarch64-linu
x-android-4.9/prebuilt/<(host_os)-<(android_host_arch)/bin', | 293 'android_toolchain%': '<(android_ndk_root)/toolchains/aarch64-linu
x-android-4.9/prebuilt/<(os_folder_name)-<(android_host_arch)/bin', |
| 290 'android_target_arch%': 'arm64', | 294 'android_target_arch%': 'arm64', |
| 291 'android_target_platform%': '21', | 295 'android_target_platform%': '21', |
| 292 'arm_version%': 'default', | 296 'arm_version%': 'default', |
| 293 }], | 297 }], |
| 294 ['target_arch == "mipsel"', { | 298 ['target_arch == "mipsel"', { |
| 295 'android_toolchain%': '<(android_ndk_root)/toolchains/mipsel-linux
-android-4.9/prebuilt/<(host_os)-<(android_host_arch)/bin', | 299 'android_toolchain%': '<(android_ndk_root)/toolchains/mipsel-linux
-android-4.9/prebuilt/<(os_folder_name)-<(android_host_arch)/bin', |
| 296 'android_target_arch%': 'mips', | 300 'android_target_arch%': 'mips', |
| 297 'android_target_platform%': '16', | 301 'android_target_platform%': '16', |
| 302 'arm_version%': 'default', |
| 298 }], | 303 }], |
| 299 ['target_arch == "mips64el"', { | 304 ['target_arch == "mips64el"', { |
| 300 'android_toolchain%': '<(android_ndk_root)/toolchains/mips64el-lin
ux-android-4.9/prebuilt/<(host_os)-<(android_host_arch)/bin', | 305 'android_toolchain%': '<(android_ndk_root)/toolchains/mips64el-lin
ux-android-4.9/prebuilt/<(os_folder_name)-<(android_host_arch)/bin', |
| 301 'android_target_arch%': 'mips64', | 306 'android_target_arch%': 'mips64', |
| 302 'android_target_platform%': '21', | 307 'android_target_platform%': '21', |
| 308 'arm_version%': 'default', |
| 303 }], | 309 }], |
| 304 ], | 310 ], |
| 305 }, | 311 }, |
| 306 | 312 |
| 307 # Copy conditionally-set variables out one scope. | 313 # Copy conditionally-set variables out one scope. |
| 308 'android_target_arch%': '<(android_target_arch)', | 314 'android_target_arch%': '<(android_target_arch)', |
| 309 'android_target_platform%': '<(android_target_platform)', | 315 'android_target_platform%': '<(android_target_platform)', |
| 310 'android_toolchain%': '<(android_toolchain)', | 316 'android_toolchain%': '<(android_toolchain)', |
| 311 'arm_version%': '<(arm_version)', | 317 'arm_version%': '<(arm_version)', |
| 312 'host_os%': '<(host_os)', | 318 'host_os%': '<(host_os)', |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 344 'android_libcpp_include': '<(android_stl)/llvm-libc++/libcxx/include
', | 350 'android_libcpp_include': '<(android_stl)/llvm-libc++/libcxx/include
', |
| 345 'android_libcpp_abi_include': '<(android_stl)/llvm-libc++abi/libcxxa
bi/include', | 351 'android_libcpp_abi_include': '<(android_stl)/llvm-libc++abi/libcxxa
bi/include', |
| 346 'android_libcpp_libs': '<(android_stl)/llvm-libc++/libs', | 352 'android_libcpp_libs': '<(android_stl)/llvm-libc++/libs', |
| 347 'android_support_include': '<(android_ndk_root)/sources/android/supp
ort/include', | 353 'android_support_include': '<(android_ndk_root)/sources/android/supp
ort/include', |
| 348 'android_sysroot': '<(android_sysroot)', | 354 'android_sysroot': '<(android_sysroot)', |
| 349 }], | 355 }], |
| 350 ], | 356 ], |
| 351 'android_libcpp_library': 'c++_static', | 357 'android_libcpp_library': 'c++_static', |
| 352 }], # OS=="android" | 358 }], # OS=="android" |
| 353 ['host_clang==1', { | 359 ['host_clang==1', { |
| 360 'conditions':[ |
| 361 ['OS=="android"', { |
| 362 'host_ld': '<!(which ld)', |
| 363 'host_ranlib': '<!(which ranlib)', |
| 364 }], |
| 365 ], |
| 354 'host_cc': '<(clang_dir)/bin/clang', | 366 'host_cc': '<(clang_dir)/bin/clang', |
| 355 'host_cxx': '<(clang_dir)/bin/clang++', | 367 'host_cxx': '<(clang_dir)/bin/clang++', |
| 356 }, { | 368 }, { |
| 357 'host_cc': '<!(which gcc)', | 369 'host_cc': '<!(which gcc)', |
| 358 'host_cxx': '<!(which g++)', | 370 'host_cxx': '<!(which g++)', |
| 359 }], | 371 }], |
| 360 ], | 372 ], |
| 361 # Default ARM variable settings. | 373 # Default ARM variable settings. |
| 362 'arm_version%': 'default', | 374 'arm_version%': 'default', |
| 363 'arm_fpu%': 'vfpv3', | 375 'arm_fpu%': 'vfpv3', |
| (...skipping 817 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1181 '-Wl,--as-needed', | 1193 '-Wl,--as-needed', |
| 1182 ], | 1194 ], |
| 1183 }], | 1195 }], |
| 1184 ], # target_conditions | 1196 ], # target_conditions |
| 1185 }, # target_defaults | 1197 }, # target_defaults |
| 1186 }], # OS=="android" | 1198 }], # OS=="android" |
| 1187 ['OS=="android" and clang==0', { | 1199 ['OS=="android" and clang==0', { |
| 1188 # Hardcode the compiler names in the Makefile so that | 1200 # Hardcode the compiler names in the Makefile so that |
| 1189 # it won't depend on the environment at make time. | 1201 # it won't depend on the environment at make time. |
| 1190 'make_global_settings': [ | 1202 'make_global_settings': [ |
| 1203 ['LD', '<!(/bin/echo -n <(android_toolchain)/../*/bin/ld)'], |
| 1204 ['RANLIB', '<!(/bin/echo -n <(android_toolchain)/../*/bin/ranlib)'], |
| 1191 ['CC', '<!(/bin/echo -n <(android_toolchain)/*-gcc)'], | 1205 ['CC', '<!(/bin/echo -n <(android_toolchain)/*-gcc)'], |
| 1192 ['CXX', '<!(/bin/echo -n <(android_toolchain)/*-g++)'], | 1206 ['CXX', '<!(/bin/echo -n <(android_toolchain)/*-g++)'], |
| 1207 ['LD.host', '<(host_ld)'], |
| 1208 ['RANLIB.host', '<(host_ranlib)'], |
| 1193 ['CC.host', '<(host_cc)'], | 1209 ['CC.host', '<(host_cc)'], |
| 1194 ['CXX.host', '<(host_cxx)'], | 1210 ['CXX.host', '<(host_cxx)'], |
| 1195 ], | 1211 ], |
| 1196 }], | 1212 }], |
| 1197 ['clang!=1 and host_clang==1 and target_arch!="ia32" and target_arch!="x64"'
, { | 1213 ['clang!=1 and host_clang==1 and target_arch!="ia32" and target_arch!="x64"'
, { |
| 1198 'make_global_settings': [ | 1214 'make_global_settings': [ |
| 1199 ['CC.host', '<(clang_dir)/bin/clang'], | 1215 ['CC.host', '<(clang_dir)/bin/clang'], |
| 1200 ['CXX.host', '<(clang_dir)/bin/clang++'], | 1216 ['CXX.host', '<(clang_dir)/bin/clang++'], |
| 1201 ], | 1217 ], |
| 1202 }], | 1218 }], |
| (...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1386 '-fsanitize=cfi-vcall', | 1402 '-fsanitize=cfi-vcall', |
| 1387 '-fsanitize=cfi-derived-cast', | 1403 '-fsanitize=cfi-derived-cast', |
| 1388 '-fsanitize=cfi-unrelated-cast', | 1404 '-fsanitize=cfi-unrelated-cast', |
| 1389 ], | 1405 ], |
| 1390 }], | 1406 }], |
| 1391 ], | 1407 ], |
| 1392 }, | 1408 }, |
| 1393 }], | 1409 }], |
| 1394 ], | 1410 ], |
| 1395 } | 1411 } |
| OLD | NEW |