diff --git a/BUILD.gn b/BUILD.gn index f3aa56325af3fedc1fcaa4e71f54d97803c63285..999796cf5a3443ad4d69c1a2c93f0399b62614b8 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -190,9 +190,12 @@ config("ark_toolchain_common_config") { defines += [ "NDEBUG" ] } - if (defined(enable_cmc_gc) && enable_cmc_gc) { + if (toolchain_enable_cmc_gc) { + print("########## toolchain enable cmc-gc ##############") defines += [ "USE_CMC_GC" ] defines += [ "USE_READ_BARRIER" ] + } else { + print("########## toolchain disable cmc-gc ##############") } } diff --git a/toolchain_config.gni b/toolchain_config.gni index 5ed5f7e16a571c261b209da44c7d7ba488710abe..60d1354ea46812f6576ecdabae346e2a095647c9 100644 --- a/toolchain_config.gni +++ b/toolchain_config.gni @@ -11,10 +11,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -if (!defined(enable_cmc_gc)) { - enable_cmc_gc = false -} - if (!defined(ark_standalone_build)) { ark_standalone_build = false } @@ -23,6 +19,14 @@ if (target_cpu == "arm64") { TARGET = "aarch64" } +declare_args() { + toolchain_enable_cmc_gc = false +} + +if (defined(enable_cmc_gc) && !toolchain_enable_cmc_gc) { + toolchain_enable_cmc_gc = enable_cmc_gc +} + if (!ark_standalone_build) { build_root = "//build" ark_third_party_root = "//third_party"