build: Move built openssl to out where it belongs.

2025-02-02 14:39:36 -05:00
parent 28d181f8bc
commit eccdbf29ab
5 changed files with 47 additions and 48 deletions
--- a/55
+++ b/55
@@ -227,15 +227,15 @@ $(WINDOWS_TARGETS): CFLAGS += \
 	-D_WIN32_WINNT=0x0A00 \
 	-DWINVER=0x0A00 \
 	-DNTDDI_VERSION=NTDDI_WIN10 \
-	-Ideps/openssl/mingw64/usr/local/include
+	-Iout/openssl/mingw64/usr/local/include
 $(WINDOWS_TARGETS): LDFLAGS += \
 	-static \
 	-lm \
-	-Ldeps/openssl/mingw64/usr/local/lib
+	-Lout/openssl/mingw64/usr/local/lib
 $(AARCH64_TARGETS): CC = aarch64-linux-gnu-gcc
 $(AARCH64_TARGETS): AS = $(CC)
-$(AARCH64_TARGETS): CFLAGS += -Ideps/openssl/Linux/aarch64/usr/local/include
-$(AARCH64_TARGETS): LDFLAGS += -Ldeps/openssl/Linux/aarch64/usr/local/lib
+$(AARCH64_TARGETS): CFLAGS += -Iout/openssl/Linux/aarch64/usr/local/include
+$(AARCH64_TARGETS): LDFLAGS += -Lout/openssl/Linux/aarch64/usr/local/lib
 ifeq ($(UNAME_S),Darwin)
 $(HOST_TARGETS): CC = xcrun clang
 $(IOS_TARGETS): IOS_SYSROOT := $(shell xcrun --sdk iphoneos --show-sdk-path)
@@ -256,30 +256,30 @@ $(ANDROID_TARGETS): AS = $(CC)
 $(ANDROID_TARGETS): CFLAGS += \
 	-target $(ANDROID_NDK_TARGET_TRIPLE)$(ANDROID_MIN_SDK_VERSION) \
 	-Wno-unknown-warning-option
-$(ANDROID_ARMV7A_TARGETS): CFLAGS += -Ideps/openssl/android/armeabi-v7a/usr/local/include
-$(ANDROID_ARMV7A_TARGETS): LDFLAGS += -Ldeps/openssl/android/armeabi-v7a/usr/local/lib
-$(ANDROID_ARM64_TARGETS): CFLAGS += -Ideps/openssl/android/arm64-v8a/usr/local/include
-$(ANDROID_ARM64_TARGETS): LDFLAGS += -Ldeps/openssl/android/arm64-v8a/usr/local/lib
-$(ANDROID_X86_TARGETS): CFLAGS += -Ideps/openssl/android/x86/usr/local/include
+$(ANDROID_ARMV7A_TARGETS): CFLAGS += -Iout/openssl/android/armeabi-v7a/usr/local/include
+$(ANDROID_ARMV7A_TARGETS): LDFLAGS += -Lout/openssl/android/armeabi-v7a/usr/local/lib
+$(ANDROID_ARM64_TARGETS): CFLAGS += -Iout/openssl/android/arm64-v8a/usr/local/include
+$(ANDROID_ARM64_TARGETS): LDFLAGS += -Lout/openssl/android/arm64-v8a/usr/local/lib
+$(ANDROID_X86_TARGETS): CFLAGS += -Iout/openssl/android/x86/usr/local/include
 $(ANDROID_X86_TARGETS): CFLAGS += -Wno-atomic-alignment
-$(ANDROID_X86_TARGETS): LDFLAGS += -Ldeps/openssl/android/x86/usr/local/lib
-$(ANDROID_X86_64_TARGETS): CFLAGS += -Ideps/openssl/android/x86_64/usr/local/include
-$(ANDROID_X86_64_TARGETS): LDFLAGS += -Ldeps/openssl/android/x86_64/usr/local/lib
+$(ANDROID_X86_TARGETS): LDFLAGS += -Lout/openssl/android/x86/usr/local/lib
+$(ANDROID_X86_64_TARGETS): CFLAGS += -Iout/openssl/android/x86_64/usr/local/include
+$(ANDROID_X86_64_TARGETS): LDFLAGS += -Lout/openssl/android/x86_64/usr/local/lib
 $(NONMACOS_TARGETS): CFLAGS += -Wno-cast-function-type
 $(DEADSTRIP_TARGETS): LDFLAGS += -Wl,--gc-sections
 $(IOS_TARGETS): CFLAGS += -miphoneos-version-min=9.0
 $(IOS_TARGETS): LDFLAGS += -miphoneos-version-min=9.0
 ifeq ($(UNAME_S),Darwin)
-$(IOS_TARGETS): CFLAGS += -Ideps/openssl/ios/ios64-xcrun/usr/local/include
-$(IOS_TARGETS): LDFLAGS += -Ldeps/openssl/ios/ios64-xcrun/usr/local/lib
+$(IOS_TARGETS): CFLAGS += -Iout/openssl/ios/ios64-xcrun/usr/local/include
+$(IOS_TARGETS): LDFLAGS += -Lout/openssl/ios/ios64-xcrun/usr/local/lib
 else
-$(IOS_TARGETS): CFLAGS += -Ideps/openssl/$(UNAME_S)/ios64-cross/usr/local/include
-$(IOS_TARGETS): LDFLAGS += -Ldeps/openssl/$(UNAME_S)/ios64-cross/usr/local/lib
+$(IOS_TARGETS): CFLAGS += -Iout/openssl/$(UNAME_S)/ios64-cross/usr/local/include
+$(IOS_TARGETS): LDFLAGS += -Lout/openssl/$(UNAME_S)/ios64-cross/usr/local/lib
 endif
-$(IOSSIM_TARGETS): CFLAGS += -Ideps/openssl/ios/iossimulator-xcrun/usr/local/include
-$(IOSSIM_TARGETS): LDFLAGS += -Ldeps/openssl/ios/iossimulator-xcrun/usr/local/lib
-$(HOST_TARGETS): CFLAGS += -Ideps/openssl/$(UNAME_S)/$(UNAME_M)/usr/local/include
-$(HOST_TARGETS): LDFLAGS += -Ldeps/openssl/$(UNAME_S)/$(UNAME_M)/usr/local/lib
+$(IOSSIM_TARGETS): CFLAGS += -Iout/openssl/ios/iossimulator-xcrun/usr/local/include
+$(IOSSIM_TARGETS): LDFLAGS += -Lout/openssl/ios/iossimulator-xcrun/usr/local/lib
+$(HOST_TARGETS): CFLAGS += -Iout/openssl/$(UNAME_S)/$(UNAME_M)/usr/local/include
+$(HOST_TARGETS): LDFLAGS += -Lout/openssl/$(UNAME_S)/$(UNAME_M)/usr/local/lib

 ifeq ($(UNAME_M),x86_64)
 ifeq ($(UNAME_S),Linux)
@@ -1137,28 +1137,28 @@ iossimdebuggo: out/tildefriends-iossimdebug.app/tildefriends ## Build, install,
 	xcrun simctl launch booted com.unprompted.tildefriends
 .PHONY: iossimdebuggo

-ANDROID_DEPS := deps/openssl/android/arm64-v8a/usr/local/lib/libssl.a
+ANDROID_DEPS := out/openssl/android/arm64-v8a/usr/local/lib/libssl.a
 $(ANDROID_DEPS):
 	+@ANDROID_NDK_ROOT=$(ANDROID_NDK) tools/ssl-android
 $(filter $(BUILD_DIR)/android%,$(APP_OBJS)): | $(ANDROID_DEPS)

 ifeq ($(UNAME_S),Linux)
 ifneq ($(USE_SYSTEM_SSL),1)
-LOCAL_DEPS := deps/openssl/$(UNAME_S)/$(UNAME_M)/usr/local/lib/libssl.a
+LOCAL_DEPS := out/openssl/$(UNAME_S)/$(UNAME_M)/usr/local/lib/libssl.a
 $(LOCAL_DEPS):
 	+@/usr/bin/env bash tools/ssl-local
 $(filter $(BUILD_DIR)/debug/%,$(APP_OBJS)) $(filter $(BUILD_DIR)/release/%,$(APP_OBJS)): | $(LOCAL_DEPS)
 endif

 ifeq ($(HAVE_CROSS_AARCH64),1)
-LOCAL_DEPS := deps/openssl/$(UNAME_S)/aarch64/usr/local/lib/libssl.a
+LOCAL_DEPS := out/openssl/$(UNAME_S)/aarch64/usr/local/lib/libssl.a
 $(LOCAL_DEPS):
 	+@OPTIONS="--cross-compile-prefix=aarch64-linux-gnu-" BUILD_TARGET=aarch64 tools/ssl-local
 $(filter $(BUILD_DIR)/armdebug/%,$(APP_OBJS)) $(filter $(BUILD_DIR)/armrelease/%,$(APP_OBJS)): | $(LOCAL_DEPS)
 endif

 ifeq ($(HAVE_LINUX_IOS),1)
-LOCAL_DEPS := deps/openssl/$(UNAME_S)/ios64-cross/usr/local/lib/libssl.a
+LOCAL_DEPS := out/openssl/$(UNAME_S)/ios64-cross/usr/local/lib/libssl.a
 $(LOCAL_DEPS):
 	+@PATH=deps/ios_toolchain/target/bin:$$PATH \
 		BUILD_TARGET=ios64-cross \
@@ -1174,21 +1174,21 @@ endif
 endif

 ifeq ($(UNAME_S),Darwin)
-LOCAL_DEPS := deps/openssl/$(UNAME_S)/$(UNAME_M)/usr/local/lib/libssl.a
+LOCAL_DEPS := out/openssl/$(UNAME_S)/$(UNAME_M)/usr/local/lib/libssl.a
 $(LOCAL_DEPS):
 	+@tools/ssl-local
 $(filter $(BUILD_DIR)/debug/%,$(APP_OBJS)) $(filter $(BUILD_DIR)/release/%,$(APP_OBJS)): | $(LOCAL_DEPS)
 endif

 ifeq ($(HAVE_WIN),1)
-WINDOWS_DEPS := deps/openssl/mingw64/usr/local/lib/libssl.a
+WINDOWS_DEPS := out/openssl/mingw64/usr/local/lib/libssl.a
 $(WINDOWS_DEPS):
 	+@tools/ssl-mingw64
 $(filter $(BUILD_DIR)/win%,$(APP_OBJS)): | $(WINDOWS_DEPS)
 endif

 ifeq ($(UNAME_S),Darwin)
-IOS_DEPS := deps/openssl/ios/ios64-xcrun/usr/local/lib/libssl.a
+IOS_DEPS := out/openssl/ios/ios64-xcrun/usr/local/lib/libssl.a
 $(IOS_DEPS):
 	+@tools/ssl-ios
 $(filter $(BUILD_DIR)/ios%,$(APP_OBJS)): | $(IOS_DEPS)
@@ -1262,7 +1262,6 @@ tarball: ## Build an all-inclusive source tarball (.tar.xz).
 		--exclude=deps/libsodium/test \
 		--exclude=deps/libuv/docs \
 		--exclude=deps/libuv/test \
-		--exclude=deps/openssl \
 		--exclude=deps/speedscope/*.map \
 		--exclude=deps/sqlite/shell.c \
 		--exclude=deps/zlib/contrib/vstudio \
--- a/tools/ssl-android
+++ b/tools/ssl-android
@@ -126,11 +126,11 @@ do
    build_the_thing
    popd
    echo WORK_DIR=$WORK_DIR
-    rm -rf deps/openssl/android/$build_target/
-    mkdir -p deps/openssl/android/$build_target/usr/local/include/
-    mkdir -p deps/openssl/android/$build_target/usr/local/lib/
-    cp -R $WORK_DIR/include/* deps/openssl/android/$build_target/usr/local/include/
-    cp $WORK_DIR/*.a deps/openssl/android/$build_target/usr/local/lib/
+    rm -rf out/openssl/android/$build_target/
+    mkdir -p out/openssl/android/$build_target/usr/local/include/
+    mkdir -p out/openssl/android/$build_target/usr/local/lib/
+    cp -R $WORK_DIR/include/* out/openssl/android/$build_target/usr/local/include/
+    cp $WORK_DIR/*.a out/openssl/android/$build_target/usr/local/lib/
 done

 echo Success
--- a/tools/ssl-ios
+++ b/tools/ssl-ios
@@ -47,11 +47,11 @@ do
    build_the_thing
    popd
    echo WORK_DIR=$WORK_DIR
-    rm -rf deps/openssl/ios/$build_target/
-    mkdir -p deps/openssl/ios/$build_target/usr/local/include/
-    mkdir -p deps/openssl/ios/$build_target/usr/local/lib/
-    cp -R $WORK_DIR/include/* deps/openssl/ios/$build_target/usr/local/include/
-    cp $WORK_DIR/*.a deps/openssl/ios/$build_target/usr/local/lib/
+    rm -rf out/openssl/ios/$build_target/
+    mkdir -p out/openssl/ios/$build_target/usr/local/include/
+    mkdir -p out/openssl/ios/$build_target/usr/local/lib/
+    cp -R $WORK_DIR/include/* out/openssl/ios/$build_target/usr/local/include/
+    cp $WORK_DIR/*.a out/openssl/ios/$build_target/usr/local/lib/
 done

 echo Success
--- a/tools/ssl-local
+++ b/tools/ssl-local
@@ -85,10 +85,10 @@ make -s build_generated && \
 make -s libcrypto.a libssl.a || exit 128
 popd
 echo WORK_DIR=$WORK_DIR
-rm -rf deps/openssl/$BUILD_PLATFORM/$BUILD_TARGET/
-mkdir -p deps/openssl/$BUILD_PLATFORM/$BUILD_TARGET/usr/local/include/
-mkdir -p deps/openssl/$BUILD_PLATFORM/$BUILD_TARGET/usr/local/lib/
-cp -R $WORK_DIR/include/* deps/openssl/$BUILD_PLATFORM/$BUILD_TARGET/usr/local/include/
-cp $WORK_DIR/*.a deps/openssl/$BUILD_PLATFORM/$BUILD_TARGET/usr/local/lib/
+rm -rf out/openssl/$BUILD_PLATFORM/$BUILD_TARGET/
+mkdir -p out/openssl/$BUILD_PLATFORM/$BUILD_TARGET/usr/local/include/
+mkdir -p out/openssl/$BUILD_PLATFORM/$BUILD_TARGET/usr/local/lib/
+cp -R $WORK_DIR/include/* out/openssl/$BUILD_PLATFORM/$BUILD_TARGET/usr/local/include/
+cp $WORK_DIR/*.a out/openssl/$BUILD_PLATFORM/$BUILD_TARGET/usr/local/lib/

 echo Success
--- a/tools/ssl-mingw64
+++ b/tools/ssl-mingw64
@@ -84,11 +84,11 @@ do
    build_the_thing
    popd
    echo WORK_DIR=$WORK_DIR
-    rm -rf deps/openssl/$build_target/
-    mkdir -p deps/openssl/$build_target/usr/local/include/
-    mkdir -p deps/openssl/$build_target/usr/local/lib/
-    cp -R $WORK_DIR/include/* deps/openssl/$build_target/usr/local/include/
-    cp $WORK_DIR/*.a deps/openssl/$build_target/usr/local/lib/
+    rm -rf out/openssl/$build_target/
+    mkdir -p out/openssl/$build_target/usr/local/include/
+    mkdir -p out/openssl/$build_target/usr/local/lib/
+    cp -R $WORK_DIR/include/* out/openssl/$build_target/usr/local/include/
+    cp $WORK_DIR/*.a out/openssl/$build_target/usr/local/lib/
 done

 echo Success