aboutsummaryrefslogtreecommitdiffhomepage
path: root/compile.sh
diff options
context:
space:
mode:
authorGravatar Thiago Farina <tfarina@chromium.org>2015-04-13 14:33:30 +0000
committerGravatar Philipp Wollermann <philwo@google.com>2015-04-14 14:29:43 +0000
commit241f46c623e4f35efe750179c230bb1be0983c16 (patch)
treed7d68982b96f3a72e12f95e06c4ee0eb55f25c51 /compile.sh
parent51707da6fc9127eb9ef8db09ef6ffdee7173b119 (diff)
Cleanup: Build file.cc as part of util library.
Looks like in the transition it was forgotten to be moved to the new location. As an effect of this change it was discovered that file.cc had an dependency back on blaze_util.cc (from client binary for die/pdie functions). In order to fix that dependency we have had to move die/pdie functions into util library (added errors.(cc|h)) for this. Tested on Linux with the following command lines: $ ./compile.sh $ ./output/bazel build //src/main/cpp:all $ ./output/bazel build //src:bazel $ ./bootstrap_test.sh all -- Change-Id: I70fb1b6189dc5af31f816332d76efe380ef26302 MOS_MIGRATED_REVID=90987514
Diffstat (limited to 'compile.sh')
-rwxr-xr-xcompile.sh5
1 files changed, 3 insertions, 2 deletions
diff --git a/compile.sh b/compile.sh
index d01fedc3a8..e8c3fe6aba 100755
--- a/compile.sh
+++ b/compile.sh
@@ -225,11 +225,12 @@ src/main/cpp/blaze_util.cc
src/main/cpp/blaze_util_${PLATFORM}.cc
src/main/cpp/blaze.cc
src/main/cpp/option_processor.cc
-src/main/cpp/util/port.cc
-src/main/cpp/util/strings.cc
+src/main/cpp/util/errors.cc
src/main/cpp/util/file.cc
src/main/cpp/util/md5.cc
src/main/cpp/util/numbers.cc
+src/main/cpp/util/port.cc
+src/main/cpp/util/strings.cc
)
NATIVE_CC_FILES=(