Remove crate-type specs in Cargo.toml, pass as arg from Makefile for …

….wasm contracts
stellar · Aug 21, 2023 · d0077bb · d0077bb
1 parent bf7d42d
commit d0077bb
Show file tree

Hide file tree

Showing 19 changed files with 2 additions and 23 deletions.
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -83,7 +83,7 @@ jobs:
       with:
         name: cargo-hack
         version: 0.5.16
-    - run: cargo-hack hack build --target wasm32-unknown-unknown --profile release
+    - run: for i in $(ls test) ; do cargo-hack hack rustc --target wasm32-unknown-unknown --profile release --crate-type cdylib -p test_${i} ; done
     - run: cargo-hack hack --feature-powerset --exclude-features docs build --target ${{ matrix.sys.target }}
     - if: startsWith(matrix.sys.target, 'x86_64')
       run: cargo-hack hack --feature-powerset --ignore-unknown-features --features testutils --exclude-features docs test --target ${{ matrix.sys.target }}

diff --git a/Makefile b/Makefile
@@ -13,7 +13,7 @@ test: fmt build
 	cargo hack --feature-powerset --ignore-unknown-features --features testutils --exclude-features docs $(CARGO_TEST_SUBCOMMAND)
 
 build: fmt
-	cargo hack build --target wasm32-unknown-unknown --release
+	for P in $(shell ls tests) ; do cargo hack rustc --target wasm32-unknown-unknown --release --crate-type cdylib -p test_$$P; done
 	cd target/wasm32-unknown-unknown/release/ && \
 		for i in *.wasm ; do \
 			ls -l "$$i"; \

diff --git a/soroban-token-sdk/Cargo.toml b/soroban-token-sdk/Cargo.toml
@@ -11,7 +11,6 @@ edition = "2021"
 rust-version = "1.71"
 
 [lib]
-crate-type = ["cdylib", "rlib"]
 doctest = false
 
 [dependencies]

diff --git a/tests/add_i128/Cargo.toml b/tests/add_i128/Cargo.toml
@@ -8,7 +8,6 @@ publish = false
 rust-version = "1.71"
 
 [lib]
-crate-type = ["cdylib"]
 doctest = false
 
 [dependencies]

diff --git a/tests/add_u128/Cargo.toml b/tests/add_u128/Cargo.toml
@@ -8,7 +8,6 @@ publish = false
 rust-version = "1.71"
 
 [lib]
-crate-type = ["cdylib"]
 doctest = false
 
 [dependencies]

diff --git a/tests/add_u64/Cargo.toml b/tests/add_u64/Cargo.toml
@@ -8,7 +8,6 @@ publish = false
 rust-version = "1.71"
 
 [lib]
-crate-type = ["cdylib"]
 doctest = false
 
 [dependencies]

diff --git a/tests/alloc/Cargo.toml b/tests/alloc/Cargo.toml
@@ -8,7 +8,6 @@ publish = false
 rust-version = "1.71"
 
 [lib]
-crate-type = ["cdylib"]
 doctest = false
 
 [dependencies]

diff --git a/tests/auth/Cargo.toml b/tests/auth/Cargo.toml
@@ -8,7 +8,6 @@ publish = false
 rust-version = "1.71"
 
 [lib]
-crate-type = ["cdylib"]
 doctest = false
 
 [dependencies]

diff --git a/tests/contract_data/Cargo.toml b/tests/contract_data/Cargo.toml
@@ -8,7 +8,6 @@ rust-version = "1.71"
 publish = false
 
 [lib]
-crate-type = ["cdylib"]
 doctest = false
 
 [dependencies]

diff --git a/tests/empty/Cargo.toml b/tests/empty/Cargo.toml
@@ -8,7 +8,6 @@ publish = false
 rust-version = "1.71"
 
 [lib]
-crate-type = ["cdylib"]
 doctest = false
 
 [dependencies]

diff --git a/tests/empty2/Cargo.toml b/tests/empty2/Cargo.toml
@@ -8,7 +8,6 @@ publish = false
 rust-version = "1.71"
 
 [lib]
-crate-type = ["cdylib"]
 doctest = false
 
 [dependencies]

diff --git a/tests/errors/Cargo.toml b/tests/errors/Cargo.toml
@@ -8,7 +8,6 @@ publish = false
 rust-version = "1.71"
 
 [lib]
-crate-type = ["cdylib"]
 doctest = false
 
 [dependencies]

diff --git a/tests/events/Cargo.toml b/tests/events/Cargo.toml
@@ -8,7 +8,6 @@ publish = false
 rust-version = "1.71"
 
 [lib]
-crate-type = ["cdylib"]
 doctest = false
 
 [dependencies]

diff --git a/tests/fuzz/Cargo.toml b/tests/fuzz/Cargo.toml
@@ -8,11 +8,6 @@ publish = false
 rust-version = "1.71"
 
 [lib]
-# Adding rlib is required so that the test_fuzz crate can be imported as a
-# library into the fuzzing crate. However, having multiple crate types is a
-# problem, it'll cause LTO optimizations to be disabled for the cdylib build.
-# TODO: Figure out what to do about this.
-crate-type = ["cdylib", "rlib"]
 doctest = false
 
 [features]

diff --git a/tests/import_contract/Cargo.toml b/tests/import_contract/Cargo.toml
@@ -8,7 +8,6 @@ publish = false
 rust-version = "1.71"
 
 [lib]
-crate-type = ["cdylib"]
 doctest = false
 
 [dependencies]

diff --git a/tests/invoke_contract/Cargo.toml b/tests/invoke_contract/Cargo.toml
@@ -8,7 +8,6 @@ publish = false
 rust-version = "1.71"
 
 [lib]
-crate-type = ["cdylib"]
 doctest = false
 
 [dependencies]

diff --git a/tests/logging/Cargo.toml b/tests/logging/Cargo.toml
@@ -8,7 +8,6 @@ publish = false
 rust-version = "1.71"
 
 [lib]
-crate-type = ["cdylib"]
 doctest = false
 
 [dependencies]

diff --git a/tests/multiimpl/Cargo.toml b/tests/multiimpl/Cargo.toml
@@ -8,7 +8,6 @@ publish = false
 rust-version = "1.71"
 
 [lib]
-crate-type = ["cdylib"]
 doctest = false
 
 [dependencies]

diff --git a/tests/udt/Cargo.toml b/tests/udt/Cargo.toml
@@ -8,7 +8,6 @@ publish = false
 rust-version = "1.71"
 
 [lib]
-crate-type = ["cdylib"]
 doctest = false
 
 [dependencies]