From 6d2b6452e89b2ab976d918d7cdc18e098dac118d Mon Sep 17 00:00:00 2001 From: Jack Moffitt Date: Fri, 25 Apr 2014 14:16:41 -0600 Subject: [PATCH] Some minor configure and Makefile cleanup. Move CFG_TARGET_TRIPLES to CFG_TARGET, since only one target is supported anyway. Create config.{mk,tmp,status} files in build directory instead of the source directory. --- .gitignore | 4 ---- Makefile.backup | 4 ++-- Makefile.in | 14 +++++++------- configure | 36 +++++++++++++++++------------------- 4 files changed, 26 insertions(+), 32 deletions(-) diff --git a/.gitignore b/.gitignore index 054b1488743..92fdd68adc7 100644 --- a/.gitignore +++ b/.gitignore @@ -12,13 +12,9 @@ *.swo .DS_Store servo-test -Makefile Servo.app build* objdir -config.mk -config.stamp -config.tmp parser.out src/components/script/dom/bindings/codegen/*.rs src/components/script/dom/bindings/codegen/_cache/ diff --git a/Makefile.backup b/Makefile.backup index 76acaf0fbfd..bbf570888da 100644 --- a/Makefile.backup +++ b/Makefile.backup @@ -11,7 +11,7 @@ include config.mk .PHONY: backup-rust restore-rust backup-rust: - -mv $(CFG_BUILD_DIR)src/compiler/rust ../$(CFG_TARGET_TRIPLES) + -mv $(CFG_BUILD_DIR)src/compiler/rust ../$(CFG_TARGET) restore-rust: - if [ -d ../$(CFG_TARGET_TRIPLES) ]; then rm -rf $(CFG_BUILD_DIR)src/compiler/rust; mv ../$(CFG_TARGET_TRIPLES) $(CFG_BUILD_DIR)src/compiler/rust; fi + if [ -d ../$(CFG_TARGET) ]; then rm -rf $(CFG_BUILD_DIR)src/compiler/rust; mv ../$(CFG_TARGET) $(CFG_BUILD_DIR)src/compiler/rust; fi diff --git a/Makefile.in b/Makefile.in index 6304d0c339b..6e860599ccf 100644 --- a/Makefile.in +++ b/Makefile.in @@ -27,7 +27,7 @@ B := $(CFG_BUILD_DIR) %:: s.% %:: SCCS/s.% -MKFILE_DEPS := config.stamp $(call rwildcard,$(S)mk/,*) +MKFILE_DEPS := $(CFG_BUILD_HOME)config.stamp $(call rwildcard,$(S)mk/,*) CFG_GCCISH_CFLAGS += -DRUST_DEBUG CFG_RUSTC_FLAGS += -D unused-imports @@ -75,12 +75,12 @@ endif ifeq ($(NEED_GIT_RECONFIG),0) else # If the submodules have changed then always execute config.mk -.PHONY: $(S)config.stamp +.PHONY: $(CFG_BUILD_HOME)config.stamp endif -$(S)Makefile $(S)config.mk: $(S)config.stamp +$(CFG_BUILD_HOME)Makefile $(CFG_BUILD_HOME)config.mk: $(CFG_BUILD_HOME)config.stamp -$(S)config.stamp : $(S)configure $(S)Makefile.in +$(CFG_BUILD_HOME)config.stamp : $(S)configure $(S)Makefile.in @$(call E, cfg: reconfiguring) $(Q)$(S)configure $(CFG_CONFIGURE_ARGS) @@ -164,7 +164,7 @@ endef # Define how to make submodule targets define DEF_SUBMODULE_RULES -ENV_RLDFLAGS_$(1) = -L $$(CFG_BUILD_HOME)workspace/lib/$$(CFG_TARGET_TRIPLES) +ENV_RLDFLAGS_$(1) = -L $$(CFG_BUILD_HOME)workspace/lib/$$(CFG_TARGET) ENV_RLDFLAGS_$(1) += $$(foreach dep,$$(DEPS_$(1)),-L $$(B)src/$$(PATH_$$(dep)) -L $$(B)src/$$(PATH_$$(dep))/.libs -L $$(B)src/$$(PATH_$$(dep))/src/.libs) # variables that depend on dependency definitions from sub.mk! @@ -369,8 +369,8 @@ package: servo else ifeq ($(CFG_OSTYPE),linux-androideabi) package: servo mkdir -p sofile - find . ! \( \( -type d -path './sofile' -o -path './$(CFG_TARGET_TRIPLES)/src/compiler/rust' \) -prune \) -name '*.so' -type f | xargs -I {} cp -f {} $(CFG_BUILD_HOME)sofile/ - find $(CFG_RUST_HOME)/lib/rustlib/$(CFG_TARGET_TRIPLES)/lib/ -name '*.so' -type f -size +1c | xargs -I {} cp -f {} $(CFG_BUILD_HOME)sofile/ + find . ! \( \( -type d -path './sofile' -o -path './$(CFG_TARGET)/src/compiler/rust' \) -prune \) -name '*.so' -type f | xargs -I {} cp -f {} $(CFG_BUILD_HOME)sofile/ + find $(CFG_RUST_HOME)/lib/rustlib/$(CFG_TARGET)/lib/ -name '*.so' -type f -size +1c | xargs -I {} cp -f {} $(CFG_BUILD_HOME)sofile/ cd $(S)src/platform/android/servo-android-glue && make with-libs cd $(CFG_BUILD_HOME) cp $(S)src/platform/android/servo-android-glue/bin/ServoAndroid-debug.apk $(CFG_BUILD_HOME) diff --git a/configure b/configure index 576f02c953d..6500fb8eeb3 100755 --- a/configure +++ b/configure @@ -73,7 +73,7 @@ putvar() { else printf "configure: %-20s := %s %s\n" $1 "$T" "$2" fi - printf "%-20s ?= %s\n" $1 "$T" >>${CFG_SRC_DIR}config.tmp + printf "%-20s ?= %s\n" $1 "$T" >>${CFG_BUILD_HOME}config.tmp } probe() { @@ -192,10 +192,10 @@ split_triple() { eval $VENDOR=$(echo "$TRIPLE" | cut -d'-' -f2) eval $OS=$(echo "$TRIPLE" | cut -d'-' -f3) - if [ $(echo "$TRIPLE" | cut -d'-' -f3) = "androideabi" ] - then - eval $OS="android" - fi + if [ $(echo "$TRIPLE" | cut -d'-' -f3) = "androideabi" ] + then + eval $OS="android" + fi } os_type() { @@ -300,7 +300,7 @@ fi os_type CFG_BUILD_OSTYPE ${OSTYPE} cpu_type CFG_BUILD_CPUTYPE ${CPUTYPE} -DEFAULT_TARGET_TRIPLE="${CFG_BUILD_CPUTYPE}-${CFG_BUILD_OSTYPE}" +DEFAULT_TARGET="${CFG_BUILD_CPUTYPE}-${CFG_BUILD_OSTYPE}" CFG_SRC_DIR="$(cd $(dirname $0) && pwd)/" CFG_BUILD_HOME="$(pwd)/" @@ -329,7 +329,7 @@ then echo "" else msg "recreating config.tmp" - echo '' >${CFG_SRC_DIR}config.tmp + echo '' >${CFG_BUILD_HOME}config.tmp step_msg "processing $CFG_SELF args" fi @@ -341,7 +341,7 @@ opt fast-make 0 "use .gitmodules as timestamp for submodule deps" opt debug 0 "build with debugging code and symbols" opt debug-skia 0 "build Skia and Azure for debugging (significant performance hit)" valopt local-rust-root "" "set prefix for local rust binary" -valopt target-triples "${DEFAULT_TARGET_TRIPLE}" "target triple to be compiled" +valopt target "${DEFAULT_TARGET}" "target to be compiled" valopt android-cross-path "/opt/ndk_standalone" "Android NDK cross compiler path" valopt android-ndk-path "/opt/android-ndk" "Android NDK path" valopt android-sdk-path "/opt/android-sdk" "Android SDK path" @@ -355,7 +355,7 @@ then fi # Split target triple -split_triple "${CFG_TARGET_TRIPLES}" TARGET_CPUTYPE TARGET_VENDOR TARGET_OSTYPE +split_triple "${CFG_TARGET}" TARGET_CPUTYPE TARGET_VENDOR TARGET_OSTYPE # Set target os and cpu type os_type CFG_OSTYPE ${TARGET_OSTYPE} @@ -399,7 +399,7 @@ esac probe CFG_CLANG clang++ -CFG_BUILD_DIR="${CFG_BUILD_HOME}${CFG_TARGET_TRIPLES}/" +CFG_BUILD_DIR="${CFG_BUILD_HOME}${CFG_TARGET}/" make_dir "${CFG_BUILD_DIR}" if [ ! -z "$CFG_LOCAL_RUST_ROOT" ] @@ -417,8 +417,8 @@ then else step_msg "using in-tree rust compiler" # The Rust compiler we're going to build - CFG_RUSTC="${CFG_BUILD_DIR}src/compiler/rust/${DEFAULT_TARGET_TRIPLE}/stage2/bin/rustc" - CFG_RUST_HOME="${CFG_BUILD_DIR}src/compiler/rust/${DEFAULT_TARGET_TRIPLE}/stage2" + CFG_RUSTC="${CFG_BUILD_DIR}src/compiler/rust/${DEFAULT_TARGET}/stage2/bin/rustc" + CFG_RUST_HOME="${CFG_BUILD_DIR}src/compiler/rust/${DEFAULT_TARGET}/stage2" fi if [ -z "$CFG_ENABLE_CLANG" -a -z "$CFG_CC" ] @@ -544,7 +544,7 @@ fi step_msg "writing configuration" -putvar CFG_TARGET_TRIPLES +putvar CFG_TARGET putvar CFG_CPUTYPE putvar CFG_OSTYPE putvar CFG_SRC_DIR @@ -564,10 +564,9 @@ putvar CFG_ENABLE_DEBUG_SKIA msg copy_if_changed ${CFG_SRC_DIR}Makefile.in ${CFG_BUILD_HOME}Makefile -move_if_changed ${CFG_SRC_DIR}config.tmp ${CFG_SRC_DIR}config.mk -copy_if_changed ${CFG_SRC_DIR}config.mk ${CFG_BUILD_HOME}config.mk -rm -f ${CFG_SRC_DIR}config.tmp -touch ${CFG_SRC_DIR}config.stamp +move_if_changed ${CFG_BUILD_HOME}config.tmp ${CFG_BUILD_HOME}config.mk +rm -f ${CFG_BUILD_HOME}config.tmp +touch ${CFG_BUILD_HOME}config.stamp export CFG_CONFIG_MK="${CFG_BUILD_HOME}config.mk" @@ -720,8 +719,7 @@ do CONFIGURE_ARGS="${CONFIGURE_ARGS} --enable-debug" fi - if [ -f ${CONFIGURE_SCRIPT} ] - then + if [ -f ${CONFIGURE_SCRIPT} ]; then (sh ${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS}) || exit $? fi done