aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--soong/darwin/config.h2
-rwxr-xr-xsoong/regen.sh4
2 files changed, 5 insertions, 1 deletions
diff --git a/soong/darwin/config.h b/soong/darwin/config.h
index 1bc3d78..a3ffbf2 100644
--- a/soong/darwin/config.h
+++ b/soong/darwin/config.h
@@ -9,7 +9,7 @@
/* #undef __x86_64_x32__ */
#endif
#ifndef __x86_64__
-#define __x86_64__ 1
+/* compiler-set */
#endif
#ifndef __alpha__
/* #undef __alpha__ */
diff --git a/soong/regen.sh b/soong/regen.sh
index 1089fd9..77089d7 100755
--- a/soong/regen.sh
+++ b/soong/regen.sh
@@ -94,6 +94,10 @@ cc_defaults {
END
${ANDROID_BUILD_TOP}/prebuilts/build-tools/$UNAME-x86/bin/bpfmt -w ../Android.bp
+if [ $DIR = "darwin" ]; then
+ sed -ibak 's%#define __x86_64__ 1%/* compiler-set */%' lib/config.h
+fi
+
cd lib
find . -name '*.h' | xargs -IX cp X ../../X
cd ../..