Run build from scripts without current environment variables

microsoft · Jun 25, 2020 · ce42bb7 · ce42bb7
1 parent fa1bd61
commit ce42bb7
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 9 deletions.
diff --git a/CrashReporter.xcodeproj/project.pbxproj b/CrashReporter.xcodeproj/project.pbxproj
@@ -3488,7 +3488,6 @@
 				MODULEMAP_FILE = Resources/CrashReporter.modulemap;
 				OTHER_CFLAGS = "-fembed-bitcode-marker";
 				"OTHER_CFLAGS[sdk=macosx*]" = "";
-				OTHER_LIBTOOLFLAGS = "-no_warning_for_no_symbols";
 				PRELINK_FLAGS = "-w";
 				PRELINK_LIBS = "$(CONFIGURATION_BUILD_DIR)/lib$(PRODUCT_NAME).a";
 				SDKROOT = iphoneos;
@@ -3515,7 +3514,6 @@
 				OTHER_CFLAGS = "-fembed-bitcode-marker";
 				"OTHER_CFLAGS[sdk=iphoneos*]" = "-fembed-bitcode";
 				"OTHER_CFLAGS[sdk=macosx*]" = "";
-				OTHER_LIBTOOLFLAGS = "-no_warning_for_no_symbols";
 				PRELINK_FLAGS = "-w";
 				PRELINK_LIBS = "$(CONFIGURATION_BUILD_DIR)/lib$(PRODUCT_NAME).a";
 				SDKROOT = iphoneos;
@@ -3732,7 +3730,6 @@
 					"$(inherited)",
 					"-DPLCF_MIN_MACOSX_SDK=$(PL_MIN_MACOSX_SDK)",
 				);
-				OTHER_LIBTOOLFLAGS = "-no_warning_for_no_symbols";
 				PRELINK_FLAGS = "-w";
 				PRELINK_LIBS = "$(CONFIGURATION_BUILD_DIR)/lib$(PRODUCT_NAME).a";
 				SDKROOT = macosx;
@@ -3754,7 +3751,6 @@
 					"$(inherited)",
 					"-DPLCF_MIN_MACOSX_SDK=$(PL_MIN_MACOSX_SDK)",
 				);
-				OTHER_LIBTOOLFLAGS = "-no_warning_for_no_symbols";
 				PRELINK_FLAGS = "-w";
 				PRELINK_LIBS = "$(CONFIGURATION_BUILD_DIR)/lib$(PRODUCT_NAME).a";
 				SDKROOT = macosx;
@@ -3816,6 +3812,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				MACOSX_DEPLOYMENT_TARGET = 10.7;
 				ONLY_ACTIVE_ARCH = YES;
+				OTHER_LIBTOOLFLAGS = "-no_warning_for_no_symbols";
 				PL_MIN_MACOSX_SDK = 101500;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.microsoft.${PRODUCT_NAME:identifier}";
 				PRODUCT_NAME = CrashReporter;
@@ -3878,6 +3875,7 @@
 				HEADER_SEARCH_PATHS = "\"$(SRCROOT)/Dependencies/protobuf-c\"";
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				MACOSX_DEPLOYMENT_TARGET = 10.7;
+				OTHER_LIBTOOLFLAGS = "-no_warning_for_no_symbols";
 				PL_MIN_MACOSX_SDK = 101500;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.microsoft.${PRODUCT_NAME:identifier}";
 				PRODUCT_NAME = CrashReporter;
@@ -3925,7 +3923,6 @@
 				MACH_O_TYPE = staticlib;
 				MODULEMAP_FILE = Resources/CrashReporter.modulemap;
 				OTHER_CFLAGS = "-fembed-bitcode-marker";
-				OTHER_LIBTOOLFLAGS = "-no_warning_for_no_symbols";
 				PRELINK_FLAGS = "-w";
 				PRELINK_LIBS = "$(CONFIGURATION_BUILD_DIR)/lib$(PRODUCT_NAME).a";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -3947,7 +3944,6 @@
 				MODULEMAP_FILE = Resources/CrashReporter.modulemap;
 				OTHER_CFLAGS = "-fembed-bitcode-marker";
 				"OTHER_CFLAGS[sdk=appletvos*]" = "-fembed-bitcode";
-				OTHER_LIBTOOLFLAGS = "-no_warning_for_no_symbols";
 				PRELINK_FLAGS = "-w";
 				PRELINK_LIBS = "$(CONFIGURATION_BUILD_DIR)/lib$(PRODUCT_NAME).a";
 				PROVISIONING_PROFILE_SPECIFIER = "";

diff --git a/Scripts/build-ios-universal.sh b/Scripts/build-ios-universal.sh
@@ -15,7 +15,7 @@ build() {
     # Print only target name and issues. Mimic Xcode output to make prettify tools happy.
     echo "=== BUILD TARGET $1 OF PROJECT ${PROJECT_NAME} WITH CONFIGURATION ${CONFIGURATION} ==="
     # OBJROOT must be customized to avoid conflicts with the current process.
-    xcodebuild \
+    env -i "PATH=$PATH" xcodebuild \
         SYMROOT="${SYMROOT}" OBJROOT="${BUILT_PRODUCTS_DIR}" PROJECT_TEMP_DIR="${PROJECT_TEMP_DIR}" \
         ONLY_ACTIVE_ARCH=NO \
         -project "${PROJECT_NAME}.xcodeproj" -configuration "${CONFIGURATION}" -target "$1" -sdk "$2"

diff --git a/Scripts/build-tvos-universal.sh b/Scripts/build-tvos-universal.sh
@@ -15,7 +15,7 @@ build() {
     # Print only target name and issues. Mimic Xcode output to make prettify tools happy.
     echo "=== BUILD TARGET $1 OF PROJECT ${PROJECT_NAME} WITH CONFIGURATION ${CONFIGURATION} ==="
     # OBJROOT must be customized to avoid conflicts with the current process.
-    xcodebuild \
+    env -i "PATH=$PATH" xcodebuild \
         SYMROOT="${SYMROOT}" OBJROOT="${BUILT_PRODUCTS_DIR}" PROJECT_TEMP_DIR="${PROJECT_TEMP_DIR}" \
         ONLY_ACTIVE_ARCH=NO \
         -project "${PROJECT_NAME}.xcodeproj" -configuration "${CONFIGURATION}" -target "$1" -sdk "$2"

diff --git a/Scripts/build-xcframework.sh b/Scripts/build-xcframework.sh
@@ -5,7 +5,7 @@ set -e
 # Print only target name and issues. Mimic Xcode output to make prettify tools happy.
 echo "=== BUILD TARGET ${PROJECT_NAME} iOS Framework OF PROJECT ${PROJECT_NAME} WITH CONFIGURATION ${CONFIGURATION} ==="
 # OBJROOT must be customized to avoid conflicts with the current process.
-xcodebuild \
+env -i "PATH=$PATH" xcodebuild \
     SYMROOT="${SYMROOT}" OBJROOT="${BUILT_PRODUCTS_DIR}" PROJECT_TEMP_DIR="${PROJECT_TEMP_DIR}" \
     ONLY_ACTIVE_ARCH=NO ARCHS="${ARCHS}" \
     -project "${PROJECT_NAME}.xcodeproj" -configuration "${CONFIGURATION}" -scheme "${PROJECT_NAME} iOS Framework" \