diff --git a/build/jam/DefaultBuildProfiles b/build/jam/DefaultBuildProfiles index 36876d88e0..5a03fc519c 100644 --- a/build/jam/DefaultBuildProfiles +++ b/build/jam/DefaultBuildProfiles @@ -2,6 +2,8 @@ switch $(HAIKU_BUILD_PROFILE) { case "bootstrap-*" : HAIKU_BOOTSTRAP_BUILD = 1 ; + HAIKU_DEFINES += HAIKU_BOOTSTRAP_BUILD ; + TARGET_DEFINES += HAIKU_BOOTSTRAP_BUILD ; } diff --git a/src/kits/package/FetchFileJob.cpp b/src/kits/package/FetchFileJob.cpp index 0b4451e765..acf0142955 100644 --- a/src/kits/package/FetchFileJob.cpp +++ b/src/kits/package/FetchFileJob.cpp @@ -11,7 +11,9 @@ #include #include +#ifndef HAIKU_BOOTSTRAP_BUILD #include +#endif #include #include @@ -67,6 +69,7 @@ FetchFileJob::Execute() if (result != B_OK) return result; + #ifndef HAIKU_BOOTSTRAP_BUILD CURL* handle = curl_easy_init(); if (handle == NULL) @@ -108,6 +111,7 @@ FetchFileJob::Execute() // precise error reporting return B_ERROR; } + #endif /* !HAIKU_BOOTSTRAP_BUILD */ return B_OK; } diff --git a/src/kits/package/InitTerminateLibPackage.cpp b/src/kits/package/InitTerminateLibPackage.cpp index e211bec71f..45b252b802 100644 --- a/src/kits/package/InitTerminateLibPackage.cpp +++ b/src/kits/package/InitTerminateLibPackage.cpp @@ -6,17 +6,25 @@ * Rene Gollent */ + +#ifndef HAIKU_BOOTSTRAP_BUILD #include +#endif + extern "C" void initialize_after() { + #ifndef HAIKU_BOOTSTRAP_BUILD curl_global_init(CURL_GLOBAL_SSL); + #endif } extern "C" void terminate_after() { + #ifndef HAIKU_BOOTSTRAP_BUILD curl_global_cleanup(); + #endif }