From 50f8f7ecac55c8dd51128cedc73dc55e1fd99ff3 Mon Sep 17 00:00:00 2001 From: Sean McManus Date: Tue, 20 May 2025 17:24:06 -0700 Subject: [PATCH] Remove -D__building_module(x)=0 workaround. --- Extension/bin/linux.clang.arm.json | 27 +++++++++++++------------- Extension/bin/linux.clang.arm64.json | 27 +++++++++++++------------- Extension/bin/linux.clang.x64.json | 27 +++++++++++++------------- Extension/bin/linux.clang.x86.json | 27 +++++++++++++------------- Extension/bin/macos.clang.arm.json | 25 ++++++++++++------------ Extension/bin/macos.clang.arm64.json | 25 ++++++++++++------------ Extension/bin/macos.clang.x64.json | 25 ++++++++++++------------ Extension/bin/macos.clang.x86.json | 25 ++++++++++++------------ Extension/bin/windows.clang.arm.json | 11 +++++------ Extension/bin/windows.clang.arm64.json | 11 +++++------ Extension/bin/windows.clang.x64.json | 11 +++++------ Extension/bin/windows.clang.x86.json | 11 +++++------ 12 files changed, 120 insertions(+), 132 deletions(-) diff --git a/Extension/bin/linux.clang.arm.json b/Extension/bin/linux.clang.arm.json index 52bd188d4..9cb51ab2c 100644 --- a/Extension/bin/linux.clang.arm.json +++ b/Extension/bin/linux.clang.arm.json @@ -1,14 +1,13 @@ -{ - "defaults": [ - "-D__building_module(x)=0", - "-Dunix=1", - "-D__unix__=1", - "-D__linux__=1", - "-D__arm__=1", - "-D__ARM_32BIT_STATE=1", - "-D__PTRDIFF_TYPE__=int", - "-D__SIZE_TYPE__=unsigned int", - "-D__WCHAR_TYPE__=long int" - ], - "defaults_op": "merge" -} +{ + "defaults": [ + "-Dunix=1", + "-D__unix__=1", + "-D__linux__=1", + "-D__arm__=1", + "-D__ARM_32BIT_STATE=1", + "-D__PTRDIFF_TYPE__=int", + "-D__SIZE_TYPE__=unsigned int", + "-D__WCHAR_TYPE__=long int" + ], + "defaults_op": "merge" +} diff --git a/Extension/bin/linux.clang.arm64.json b/Extension/bin/linux.clang.arm64.json index 00589afb6..eebe976d4 100644 --- a/Extension/bin/linux.clang.arm64.json +++ b/Extension/bin/linux.clang.arm64.json @@ -1,14 +1,13 @@ -{ - "defaults": [ - "-D__building_module(x)=0", - "-Dunix=1", - "-D__unix__=1", - "-D__linux__=1", - "-D__aarch64__=1", - "-D__ARM_64BIT_STATE=1", - "-D__PTRDIFF_TYPE__=long int", - "-D__SIZE_TYPE__=long unsigned int", - "-D__WCHAR_TYPE__=int" - ], - "defaults_op": "merge" -} +{ + "defaults": [ + "-Dunix=1", + "-D__unix__=1", + "-D__linux__=1", + "-D__aarch64__=1", + "-D__ARM_64BIT_STATE=1", + "-D__PTRDIFF_TYPE__=long int", + "-D__SIZE_TYPE__=long unsigned int", + "-D__WCHAR_TYPE__=int" + ], + "defaults_op": "merge" +} diff --git a/Extension/bin/linux.clang.x64.json b/Extension/bin/linux.clang.x64.json index da855d4bd..383389821 100644 --- a/Extension/bin/linux.clang.x64.json +++ b/Extension/bin/linux.clang.x64.json @@ -1,14 +1,13 @@ -{ - "defaults": [ - "-D__building_module(x)=0", - "-Dunix=1", - "-D__unix__=1", - "-D__linux__=1", - "-D__x86_64=1", - "-D__x86_64__=1", - "-D__PTRDIFF_TYPE__=long int", - "-D__SIZE_TYPE__=long unsigned int", - "-D__WCHAR_TYPE__=int" - ], - "defaults_op": "merge" -} +{ + "defaults": [ + "-Dunix=1", + "-D__unix__=1", + "-D__linux__=1", + "-D__x86_64=1", + "-D__x86_64__=1", + "-D__PTRDIFF_TYPE__=long int", + "-D__SIZE_TYPE__=long unsigned int", + "-D__WCHAR_TYPE__=int" + ], + "defaults_op": "merge" +} diff --git a/Extension/bin/linux.clang.x86.json b/Extension/bin/linux.clang.x86.json index 4fb1eead0..2f4e27578 100644 --- a/Extension/bin/linux.clang.x86.json +++ b/Extension/bin/linux.clang.x86.json @@ -1,14 +1,13 @@ -{ - "defaults": [ - "-D__building_module(x)=0", - "-Dunix=1", - "-D__unix__=1", - "-D__linux__=1", - "-D__i386=1", - "-D__i386__=1", - "-D__PTRDIFF_TYPE__=int", - "-D__SIZE_TYPE__=unsigned int", - "-D__WCHAR_TYPE__=long int" - ], - "defaults_op": "merge" -} +{ + "defaults": [ + "-Dunix=1", + "-D__unix__=1", + "-D__linux__=1", + "-D__i386=1", + "-D__i386__=1", + "-D__PTRDIFF_TYPE__=int", + "-D__SIZE_TYPE__=unsigned int", + "-D__WCHAR_TYPE__=long int" + ], + "defaults_op": "merge" +} diff --git a/Extension/bin/macos.clang.arm.json b/Extension/bin/macos.clang.arm.json index 0ea0f569a..3c6484f3c 100644 --- a/Extension/bin/macos.clang.arm.json +++ b/Extension/bin/macos.clang.arm.json @@ -1,13 +1,12 @@ -{ - "defaults": [ - "-D__building_module(x)=0", - "-D__APPLE__=1", - "-D__MACH__=1", - "-D__arm__=1", - "-D__ARM_32BIT_STATE=1", - "-D__PTRDIFF_TYPE__=int", - "-D__SIZE_TYPE__=unsigned int", - "-D__WCHAR_TYPE__=long int" - ], - "defaults_op": "merge" -} +{ + "defaults": [ + "-D__APPLE__=1", + "-D__MACH__=1", + "-D__arm__=1", + "-D__ARM_32BIT_STATE=1", + "-D__PTRDIFF_TYPE__=int", + "-D__SIZE_TYPE__=unsigned int", + "-D__WCHAR_TYPE__=long int" + ], + "defaults_op": "merge" +} diff --git a/Extension/bin/macos.clang.arm64.json b/Extension/bin/macos.clang.arm64.json index 80f3c2975..63c6fe0e2 100644 --- a/Extension/bin/macos.clang.arm64.json +++ b/Extension/bin/macos.clang.arm64.json @@ -1,13 +1,12 @@ -{ - "defaults": [ - "-D__building_module(x)=0", - "-D__APPLE__=1", - "-D__MACH__=1", - "-D__aarch64__=1", - "-D__ARM_64BIT_STATE=1", - "-D__PTRDIFF_TYPE__=long int", - "-D__SIZE_TYPE__=long unsigned int", - "-D__WCHAR_TYPE__=int" - ], - "defaults_op": "merge" -} +{ + "defaults": [ + "-D__APPLE__=1", + "-D__MACH__=1", + "-D__aarch64__=1", + "-D__ARM_64BIT_STATE=1", + "-D__PTRDIFF_TYPE__=long int", + "-D__SIZE_TYPE__=long unsigned int", + "-D__WCHAR_TYPE__=int" + ], + "defaults_op": "merge" +} diff --git a/Extension/bin/macos.clang.x64.json b/Extension/bin/macos.clang.x64.json index 9aa1ba565..1a24ac74e 100644 --- a/Extension/bin/macos.clang.x64.json +++ b/Extension/bin/macos.clang.x64.json @@ -1,13 +1,12 @@ -{ - "defaults": [ - "-D__building_module(x)=0", - "-D__APPLE__=1", - "-D__MACH__=1", - "-D__x86_64=1", - "-D__x86_64__=1", - "-D__PTRDIFF_TYPE__=long int", - "-D__SIZE_TYPE__=long unsigned int", - "-D__WCHAR_TYPE__=int" - ], - "defaults_op": "merge" -} +{ + "defaults": [ + "-D__APPLE__=1", + "-D__MACH__=1", + "-D__x86_64=1", + "-D__x86_64__=1", + "-D__PTRDIFF_TYPE__=long int", + "-D__SIZE_TYPE__=long unsigned int", + "-D__WCHAR_TYPE__=int" + ], + "defaults_op": "merge" +} diff --git a/Extension/bin/macos.clang.x86.json b/Extension/bin/macos.clang.x86.json index a40718d33..173ae66b6 100644 --- a/Extension/bin/macos.clang.x86.json +++ b/Extension/bin/macos.clang.x86.json @@ -1,13 +1,12 @@ -{ - "defaults": [ - "-D__building_module(x)=0", - "-D__APPLE__=1", - "-D__MACH__=1", - "-D__i386=1", - "-D__i386__=1", - "-D__PTRDIFF_TYPE__=int", - "-D__SIZE_TYPE__=unsigned int", - "-D__WCHAR_TYPE__=long int" - ], - "defaults_op": "merge" -} +{ + "defaults": [ + "-D__APPLE__=1", + "-D__MACH__=1", + "-D__i386=1", + "-D__i386__=1", + "-D__PTRDIFF_TYPE__=int", + "-D__SIZE_TYPE__=unsigned int", + "-D__WCHAR_TYPE__=long int" + ], + "defaults_op": "merge" +} diff --git a/Extension/bin/windows.clang.arm.json b/Extension/bin/windows.clang.arm.json index 5f7397c87..2a62f646c 100644 --- a/Extension/bin/windows.clang.arm.json +++ b/Extension/bin/windows.clang.arm.json @@ -1,6 +1,5 @@ -{ - "defaults": [ - "-D__building_module(x)=0" - ], - "defaults_op": "merge" -} +{ + "defaults": [ + ], + "defaults_op": "merge" +} diff --git a/Extension/bin/windows.clang.arm64.json b/Extension/bin/windows.clang.arm64.json index 5f7397c87..2a62f646c 100644 --- a/Extension/bin/windows.clang.arm64.json +++ b/Extension/bin/windows.clang.arm64.json @@ -1,6 +1,5 @@ -{ - "defaults": [ - "-D__building_module(x)=0" - ], - "defaults_op": "merge" -} +{ + "defaults": [ + ], + "defaults_op": "merge" +} diff --git a/Extension/bin/windows.clang.x64.json b/Extension/bin/windows.clang.x64.json index 5f7397c87..2a62f646c 100644 --- a/Extension/bin/windows.clang.x64.json +++ b/Extension/bin/windows.clang.x64.json @@ -1,6 +1,5 @@ -{ - "defaults": [ - "-D__building_module(x)=0" - ], - "defaults_op": "merge" -} +{ + "defaults": [ + ], + "defaults_op": "merge" +} diff --git a/Extension/bin/windows.clang.x86.json b/Extension/bin/windows.clang.x86.json index 5f7397c87..2a62f646c 100644 --- a/Extension/bin/windows.clang.x86.json +++ b/Extension/bin/windows.clang.x86.json @@ -1,6 +1,5 @@ -{ - "defaults": [ - "-D__building_module(x)=0" - ], - "defaults_op": "merge" -} +{ + "defaults": [ + ], + "defaults_op": "merge" +}