Updated buildexe

coder137 · coder137 · commit dba25f9acd8e · 2022-04-24T02:15:37.000-07:00
diff --git a/buildexe/buildexe.cpp b/buildexe/buildexe.cpp
@@ -67,7 +67,8 @@ int main(int argc, char **argv) {
 
   // Build Target
   BuildEnvSetup build_setup(toolchain, buildexe_args);
-  build_setup.ConstructTarget();
+  Reg::Toolchain(ArgToolchainState(true)).BuildPackage(build_setup);
+  Reg::Run();
 
   // Run Target if script mode
   if (buildexe_args.GetBuildMode() == BuildExeMode::Script) {
diff --git a/buildexe/include/buildexe/build_env_setup.h b/buildexe/include/buildexe/build_env_setup.h
@@ -33,11 +33,9 @@ class BuildEnvSetup {
 public:
   BuildEnvSetup(const BaseToolchain &toolchain,
                 const BuildExeArgs &buildexe_args)
-      : toolchain_(toolchain), buildexe_args_(buildexe_args) {
-    state_.build = true;
-  }
+      : toolchain_(toolchain), buildexe_args_(buildexe_args) {}
 
-  void ConstructTarget();
+  void Setup(const ArgToolchainState &state);
 
   void RunUserTarget(const ArgScriptInfo &arg_script_info);
 
diff --git a/buildexe/src/build_env_setup.cpp b/buildexe/src/build_env_setup.cpp
@@ -21,15 +21,15 @@ namespace buildcc {
 
 constexpr const char *const kTag = "BuildExe";
 
-void BuildEnvSetup::ConstructTarget() {
+void BuildEnvSetup::Setup(const ArgToolchainState &state) {
+  state_ = state;
   if (buildexe_args_.GetBuildMode() == BuildExeMode::Script) {
     // buildcc and user target
     ConstructUserTargetWithBuildcc();
   } else {
     // user target
     ConstructUserTarget();
   }
-  Reg::Run();
 }
 
 void BuildEnvSetup::RunUserTarget(const ArgScriptInfo &arg_script_info) {
