Add portable configuration (#117)

abyss7 · Aug 16, 2017 · ef147df · ef147df
1 parent 9755135
commit ef147df
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 10 deletions.
diff --git a/build/config/BUILD.gn b/build/config/BUILD.gn
@@ -51,16 +51,18 @@ config("release") {
 
   defines = [ "NDEBUG" ]
 
-  if (host_os == "linux") {
-    ldflags = [
-      "-rpath",
-      "/usr/lib/dist-clang",
-    ]
-  } else {
-    ldflags = [
-      "-rpath",
-      "/usr/local/lib/dist-clang",
-    ]
+  if (!portable_build) {
+    if (host_os == "linux") {
+      ldflags = [
+        "-rpath",
+        "/usr/lib/dist-clang",
+      ]
+    } else {
+      ldflags = [
+        "-rpath",
+        "/usr/local/lib/dist-clang",
+      ]
+    }
   }
 }
 

diff --git a/build/config/BUILDCONFIG.gn b/build/config/BUILDCONFIG.gn
@@ -9,6 +9,9 @@ declare_args() {
   # Build for testing.
   config_for_tests = false
 
+  # Portable build
+  portable_build = false
+
   # Build version.
   version = exec_script("//build/version.py", [], "string")
 

diff --git a/build/configure b/build/configure
@@ -10,4 +10,5 @@ gn_path=$gn_path/gn
 
 "$gn_path" --check --args="config_for_debug=true $@" gen //out/Debug.gn
 "$gn_path" --check --args="$@" gen //out/Release.gn
+"$gn_path" --check --args="portable_build=true $@" gen //out/Portable.gn
 "$gn_path" --check --args="config_for_tests=true $@" gen //out/Test.gn
diff --git a/build/travis.sh b/build/travis.sh
@@ -27,6 +27,7 @@ export PATH="$clang_root/bin:$PATH"
 git -C "$root_dir" fetch origin master
 ninja -C "$root_dir/out/Debug.gn" All
 ninja -C "$root_dir/out/Release.gn" All # TODO: also build 'Packages'
+ninja -C "$root_dir/out/Portable.gn" All
 ninja -C "$root_dir/out/Test.gn" Tests
 
 "$root_dir/build/run_all_tests" --test-launcher-bot-mode