Properly compute resource folder when linking statically #33168

drexin · 2020-07-28T22:03:01Z

deduplicate the logic to compute the resource folder
install headers and module files in shared and static resource folders
forward -static flag when calling swiftc with -print-target-info

drexin · 2020-07-28T22:04:06Z

@swift-ci test

compnerd

Could you please add a test for the driver path computation?

include/swift/Driver/ToolChain.h

include/swift/Frontend/Frontend.h

lib/Driver/Driver.cpp

swift-ci · 2020-07-28T22:24:40Z

Build failed
Swift Test OS X Platform
Git Sha - 06705931e0e9d5db9c548665b9d9193c8ea98f11

include/swift/Frontend/Frontend.h

lib/Driver/Driver.cpp

drexin · 2020-07-28T23:49:06Z

@swift-ci test

swift-ci · 2020-07-28T23:49:30Z

Build failed
Swift Test Linux Platform
Git Sha - 06705931e0e9d5db9c548665b9d9193c8ea98f11

drexin · 2020-07-28T23:51:22Z

@swift-ci test

drexin · 2020-07-28T23:56:38Z

@swift-ci test

swift-ci · 2020-07-29T00:36:47Z

Build failed
Swift Test Linux Platform
Git Sha - 2845806afcc093707bde8620acd9a707876dab22

drexin · 2020-07-29T00:56:33Z

@swift-ci test

swift-ci · 2020-07-29T01:07:30Z

Build failed
Swift Test OS X Platform
Git Sha - 06705931e0e9d5db9c548665b9d9193c8ea98f11

swift-ci · 2020-07-29T01:39:21Z

Build failed
Swift Test Linux Platform
Git Sha - 9da99a12d4ff74ebff0703c28fad7d1dd2104e86

drexin · 2020-07-29T04:48:30Z

@swift-ci test

swift-ci · 2020-07-29T05:00:48Z

Build failed
Swift Test OS X Platform
Git Sha - 6309e0102c7f7b900d164d9cb5987f1108470598

drexin · 2020-07-29T16:54:59Z

@swift-ci test

drexin · 2020-07-29T16:56:43Z

@swift-ci test windows

swift-ci · 2020-07-29T17:36:37Z

Build failed
Swift Test Linux Platform
Git Sha - 3eeb03d0387918e887143510e5d5dbc75142b1d7

drexin · 2020-07-29T18:01:59Z

@swift-ci test

swift-ci · 2020-07-29T19:17:13Z

Build failed
Swift Test OS X Platform
Git Sha - f8ccbddd3dbb5e2cac9cb46a9c6aee173035b877

drexin · 2020-07-30T00:27:59Z

@swift-ci test

swift-ci · 2020-07-30T00:28:22Z

Build failed
Swift Test Linux Platform
Git Sha - 9daedd580e3c312d2cb4b3c69356a83e62351f1e

swift-ci · 2020-07-30T00:28:31Z

Build failed
Swift Test OS X Platform
Git Sha - 9daedd580e3c312d2cb4b3c69356a83e62351f1e

swift-ci · 2020-07-30T00:38:52Z

Build failed
Swift Test Linux Platform
Git Sha - 9daedd580e3c312d2cb4b3c69356a83e62351f1e

drexin · 2020-07-30T01:03:00Z

@swift-ci test linux

swift-ci · 2020-07-30T03:46:03Z

Build failed
Swift Test Linux Platform
Git Sha - c7a4a9bee0284ceb7371bdf1182163d18f199c0c

drexin · 2020-07-30T15:05:51Z

@swift-ci test

swift-ci · 2020-07-30T15:08:50Z

Build failed
Swift Test Linux Platform
Git Sha - c7a4a9bee0284ceb7371bdf1182163d18f199c0c

swift-ci · 2020-07-30T15:09:03Z

Build failed
Swift Test OS X Platform
Git Sha - c7a4a9bee0284ceb7371bdf1182163d18f199c0c

drexin · 2020-07-30T15:14:30Z

@swift-ci test

swift-ci · 2020-07-30T15:48:08Z

Build failed
Swift Test Linux Platform
Git Sha - 6c6dd2703e7960c611d4b9db038fa877c4e25865

swift-ci · 2020-07-30T16:22:50Z

Build failed
Swift Test OS X Platform
Git Sha - 6c6dd2703e7960c611d4b9db038fa877c4e25865

drexin · 2020-07-30T17:34:55Z

@swift-ci test windows

swift-ci · 2020-07-30T17:37:23Z

Build failed
Swift Test OS X Platform
Git Sha - 6c6dd2703e7960c611d4b9db038fa877c4e25865

drexin · 2020-07-30T20:17:03Z

@swift-ci test windows

include/swift/Frontend/Frontend.h

include/swift/Frontend/FrontendOptions.h

- deduplicate the logic to compute the resource folder - install headers and module files in shared and static resource folders - forward -static flag when calling swiftc with -print-target-info

drexin · 2020-07-30T22:07:50Z

@swift-ci smoke test

drexin · 2020-07-30T22:15:10Z

@swift-ci smoke test windows

drexin · 2020-07-30T22:31:26Z

@swift-ci smoke test windows

DougGregor · 2020-08-04T17:28:01Z

lib/Driver/ToolChains.cpp

  if (const Arg *A = args.getLastArg(options::OPT_resource_dir)) {
    StringRef value = A->getValue();
    resourceDirPath.append(value.begin(), value.end());
  } else if (!getTriple().isOSDarwin() && args.hasArg(options::OPT_sdk)) {
    StringRef value = args.getLastArg(options::OPT_sdk)->getValue();
    resourceDirPath.append(value.begin(), value.end());
-    llvm::sys::path::append(resourceDirPath, "usr", "lib",
-                            shared ? "swift" : "swift_static");
+    llvm::sys::path::append(resourceDirPath, "usr");


Why are we adding <resource-dir>/usr now?

We are using the SDK root here as opposed to the path relative to the executable. In the executable case we get something like $PATH/bin/swiftc and remove the bin/swiftc part from it and append lib/swift[_static]. The SDK path starts one level above that, so we have to add usr only in this case.

drexin requested a review from DougGregor July 28, 2020 22:03

compnerd reviewed Jul 28, 2020

View reviewed changes

include/swift/Driver/ToolChain.h Outdated Show resolved Hide resolved

include/swift/Frontend/Frontend.h Show resolved Hide resolved

include/swift/Frontend/Frontend.h Outdated Show resolved Hide resolved

lib/Driver/Driver.cpp Show resolved Hide resolved

drexin force-pushed the wip-fix-resource-folder branch 2 times, most recently from ff6ad6f to 03c9b00 Compare July 28, 2020 22:23

compnerd reviewed Jul 28, 2020

View reviewed changes

include/swift/Frontend/Frontend.h Outdated Show resolved Hide resolved

include/swift/Frontend/Frontend.h Outdated Show resolved Hide resolved

lib/Driver/Driver.cpp Show resolved Hide resolved

drexin force-pushed the wip-fix-resource-folder branch 2 times, most recently from bb45c3f to fdf9d32 Compare July 28, 2020 23:48

drexin force-pushed the wip-fix-resource-folder branch from fdf9d32 to 2845806 Compare July 28, 2020 23:55

drexin force-pushed the wip-fix-resource-folder branch from 2845806 to 9da99a1 Compare July 29, 2020 00:55

drexin force-pushed the wip-fix-resource-folder branch from 9da99a1 to 6309e01 Compare July 29, 2020 04:48

drexin force-pushed the wip-fix-resource-folder branch from 6309e01 to 3eeb03d Compare July 29, 2020 16:54

drexin force-pushed the wip-fix-resource-folder branch from 3eeb03d to f8ccbdd Compare July 29, 2020 18:01

drexin force-pushed the wip-fix-resource-folder branch from f8ccbdd to 51c96fb Compare July 29, 2020 20:43

drexin force-pushed the wip-fix-resource-folder branch 2 times, most recently from a3c4f72 to 18c4354 Compare July 30, 2020 15:05

drexin force-pushed the wip-fix-resource-folder branch from 18c4354 to 6c6dd27 Compare July 30, 2020 15:14

drexin force-pushed the wip-fix-resource-folder branch from 6c6dd27 to e82c012 Compare July 30, 2020 17:33

compnerd approved these changes Jul 30, 2020

View reviewed changes

include/swift/Frontend/Frontend.h Outdated Show resolved Hide resolved

include/swift/Frontend/FrontendOptions.h Show resolved Hide resolved

Properly compute resource folder when linking statically

0850436

- deduplicate the logic to compute the resource folder - install headers and module files in shared and static resource folders - forward -static flag when calling swiftc with -print-target-info

drexin force-pushed the wip-fix-resource-folder branch from e82c012 to 0850436 Compare July 30, 2020 22:07

DougGregor reviewed Aug 4, 2020

View reviewed changes

DougGregor approved these changes Aug 4, 2020

View reviewed changes

drexin merged commit 7e60a73 into swiftlang:master Aug 4, 2020

drexin mentioned this pull request Aug 4, 2020

Pass -use-static-resource-dir to frontend when linking statically swiftlang/swift-driver#192

Merged

drexin mentioned this pull request Aug 28, 2020

[5.3] Properly compute resource folder when linking statically #33678

Merged

Properly compute resource folder when linking statically #33168

Properly compute resource folder when linking statically #33168

Uh oh!

Conversation

drexin commented Jul 28, 2020

Uh oh!

drexin commented Jul 28, 2020

Uh oh!

compnerd left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

swift-ci commented Jul 28, 2020

Uh oh!

Uh oh!

Uh oh!

Uh oh!

drexin commented Jul 28, 2020

Uh oh!

swift-ci commented Jul 28, 2020

Uh oh!

drexin commented Jul 28, 2020

Uh oh!

drexin commented Jul 28, 2020

Uh oh!

swift-ci commented Jul 29, 2020

Uh oh!

drexin commented Jul 29, 2020

Uh oh!

swift-ci commented Jul 29, 2020

Uh oh!

swift-ci commented Jul 29, 2020

Uh oh!

drexin commented Jul 29, 2020

Uh oh!

swift-ci commented Jul 29, 2020

Uh oh!

drexin commented Jul 29, 2020

Uh oh!

drexin commented Jul 29, 2020

Uh oh!

swift-ci commented Jul 29, 2020

Uh oh!

drexin commented Jul 29, 2020

Uh oh!

swift-ci commented Jul 29, 2020

Uh oh!

drexin commented Jul 30, 2020

Uh oh!

swift-ci commented Jul 30, 2020

Uh oh!

swift-ci commented Jul 30, 2020

Uh oh!

swift-ci commented Jul 30, 2020

Uh oh!

drexin commented Jul 30, 2020

Uh oh!

swift-ci commented Jul 30, 2020

Uh oh!

drexin commented Jul 30, 2020

Uh oh!

swift-ci commented Jul 30, 2020

Uh oh!

swift-ci commented Jul 30, 2020

Uh oh!

drexin commented Jul 30, 2020

Uh oh!

swift-ci commented Jul 30, 2020

Uh oh!

swift-ci commented Jul 30, 2020

Uh oh!

drexin commented Jul 30, 2020

Uh oh!

swift-ci commented Jul 30, 2020

Uh oh!

drexin commented Jul 30, 2020

Uh oh!

drexin Aug 4, 2020 •

edited

Loading