commit 968e536605061ec37e982dcb76d6e5e45b1f1b3c
Author: Georg Koppen <gk(a)torproject.org>
Date: Sun Aug 30 19:01:19 2020 +0000
Bug 40002: Rename Linux debug builds to ASan builds
---
Makefile | 16 ++++++++--------
README.MAKEFILE | 4 ++--
projects/release/config | 6 +++---
rbm.conf | 6 +++---
4 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/Makefile b/Makefile
index 3cc297a..391f5d0 100644
--- a/Makefile
+++ b/Makefile
@@ -23,8 +23,8 @@ release-android-aarch64: submodule-update
release-linux-x86_64: submodule-update
$(rbm) build release --target release --target torbrowser-linux-x86_64
-release-linux-x86_64-debug: submodule-update
- $(rbm) build release --target release --target torbrowser-linux-x86_64-debug
+release-linux-x86_64-asan: submodule-update
+ $(rbm) build release --target release --target torbrowser-linux-x86_64-asan
release-linux-i686: submodule-update
$(rbm) build release --target release --target torbrowser-linux-i686
@@ -62,8 +62,8 @@ alpha-android-aarch64: submodule-update
alpha-linux-x86_64: submodule-update
$(rbm) build release --target alpha --target torbrowser-linux-x86_64
-alpha-linux-x86_64-debug: submodule-update
- $(rbm) build release --target alpha --target torbrowser-linux-x86_64-debug
+alpha-linux-x86_64-asan: submodule-update
+ $(rbm) build release --target alpha --target torbrowser-linux-x86_64-asan
alpha-linux-i686: submodule-update
$(rbm) build release --target alpha --target torbrowser-linux-i686
@@ -101,8 +101,8 @@ nightly-android-aarch64: submodule-update
nightly-linux-x86_64: submodule-update
$(rbm) build release --target nightly --target torbrowser-linux-x86_64
-nightly-linux-x86_64-debug: submodule-update
- $(rbm) build release --target nightly --target torbrowser-linux-x86_64-debug
+nightly-linux-x86_64-asan: submodule-update
+ $(rbm) build release --target nightly --target torbrowser-linux-x86_64-asan
nightly-linux-i686: submodule-update
$(rbm) build release --target nightly --target torbrowser-linux-i686
@@ -140,8 +140,8 @@ testbuild-android-aarch64: submodule-update
testbuild-linux-x86_64: submodule-update
$(rbm) build release --target testbuild --target torbrowser-linux-x86_64
-testbuild-linux-x86_64-debug: submodule-update
- $(rbm) build release --target testbuild --target torbrowser-linux-x86_64-debug
+testbuild-linux-x86_64-asan: submodule-update
+ $(rbm) build release --target testbuild --target torbrowser-linux-x86_64-asan
testbuild-linux-i686: submodule-update
$(rbm) build release --target testbuild --target torbrowser-linux-i686
diff --git a/README.MAKEFILE b/README.MAKEFILE
index 62b54df..b198985 100644
--- a/README.MAKEFILE
+++ b/README.MAKEFILE
@@ -44,9 +44,9 @@ By default it is based on the alpha channel, but you can change that by
editing rbm.local.conf. The resulting build can be found in directory
testbuild.
-{release,alpha,nightly,testbuild}-linux-x86_64-debug
+{release,alpha,nightly,testbuild}-linux-x86_64-asan
----------------------------------------------------
-Create a debug build for Linux x86_64 with debug features such as ASan.
+Create a build for Linux x86_64 with Address Sanitizer enabled.
{release,alpha,nightly,testbuild}-src
-------------------------------------
diff --git a/projects/release/config b/projects/release/config
index 8505971..aac9a94 100644
--- a/projects/release/config
+++ b/projects/release/config
@@ -47,10 +47,10 @@ targets:
torbrowser-linux-x86_64:
var:
torbrowser-linux-x86_64: 1
- torbrowser-linux-x86_64-debug:
+ torbrowser-linux-x86_64-asan:
var:
torbrowser-linux-x86_64: 1
- debug-build: '-debug'
+ asan-build: '-asan'
torbrowser-linux-i686:
var:
torbrowser-linux-i686: 1
@@ -154,7 +154,7 @@ input_files:
enable: '[% c("var/torbrowser-linux-x86_64") %]'
target:
- '[% c("var/build_target") %]'
- - 'torbrowser-linux-x86_64[% c("var/debug-build") %]'
+ - 'torbrowser-linux-x86_64[% c("var/asan-build") %]'
- name: linux-i686
project: tor-browser
diff --git a/rbm.conf b/rbm.conf
index 3efbe0c..bafc7e9 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -335,8 +335,8 @@ targets:
torbrowser-linux-x86_64:
- linux-x86_64
- linux
- torbrowser-linux-x86_64-debug:
- - linux-debug
+ torbrowser-linux-x86_64-asan:
+ - linux-asan
- linux-x86_64
- linux
torbrowser-linux-i686:
@@ -380,7 +380,7 @@ targets:
- libtool
- zip
- unzip
- linux-debug:
+ linux-asan:
var:
asan: 1
# RLBox needs clang to create .wasm files but we use mostly GCC for our