ArmPlatformPkg/NorFlashDxe: eliminate void pointer arithmetic

[mirror_edk2.git] / BaseTools / BuildEnv

diff --git a/BaseTools/BuildEnv b/BaseTools/BuildEnv
index 7c77454bf88bdf106a720400a64f1c8446115a09..cb6403a52ba60bbc234f539da277d0bb78436d52 100755 (executable)
--- a/BaseTools/BuildEnv
+++ b/BaseTools/BuildEnv
@@ -3,6 +3,7 @@
 # This file must be "sourced" not merely executed. For example: ". edksetup.sh"
 #
 # Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2016, Linaro Ltd. All rights reserved.<BR>
 # This program and the accompanying materials
 # are licensed and made available under the terms and conditions of the BSD License
 # which accompanies this distribution.  The full text of the license may be found at
@@ -215,7 +216,7 @@ CopySingleTemplateFile() {
 
   if [ -e $DST_FILENAME ]
   then
-    return
+    [ $RECONFIG != TRUE ] && return
   fi
 
   echo "Copying \$EDK_TOOLS_PATH/$SRC_FILENAME"