Skip to content

Commit 3bbc56d

Browse files
committed
Try to fix macOS double-RPATH problem
1 parent 9e2df44 commit 3bbc56d

55 files changed

Lines changed: 0 additions & 55 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

src/amuse_aarsethzare/support/configure

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2400,7 +2400,6 @@ then :
24002400
24012401
# Conda does not set FCFLAGS, so we copy from FFLAGS here
24022402
FCFLAGS="$FFLAGS"
2403-
LDFLAGS="$LDFLAGS -L${CONDA_PREFIX}/lib -Wl,-rpath,${CONDA_PREFIX}/lib"
24042403
# Conda pkg-config includes this already, but in case we have one from
24052404
# the system...
24062405
PKG_CONFIG_PATH="$PKG_CONFIG_PATH:${CONDA_PREFIX}/lib/pkgconfig"

src/amuse_adaptb/support/configure

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2771,7 +2771,6 @@ then :
27712771

27722772
# Conda does not set FCFLAGS, so we copy from FFLAGS here
27732773
FCFLAGS="$FFLAGS"
2774-
LDFLAGS="$LDFLAGS -L${CONDA_PREFIX}/lib -Wl,-rpath,${CONDA_PREFIX}/lib"
27752774
# Conda pkg-config includes this already, but in case we have one from
27762775
# the system...
27772776
PKG_CONFIG_PATH="$PKG_CONFIG_PATH:${CONDA_PREFIX}/lib/pkgconfig"

src/amuse_athena/support/configure

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2841,7 +2841,6 @@ then :
28412841

28422842
# Conda does not set FCFLAGS, so we copy from FFLAGS here
28432843
FCFLAGS="$FFLAGS"
2844-
LDFLAGS="$LDFLAGS -L${CONDA_PREFIX}/lib -Wl,-rpath,${CONDA_PREFIX}/lib"
28452844
# Conda pkg-config includes this already, but in case we have one from
28462845
# the system...
28472846
PKG_CONFIG_PATH="$PKG_CONFIG_PATH:${CONDA_PREFIX}/lib/pkgconfig"

src/amuse_bhtree/support/configure

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2749,7 +2749,6 @@ then :
27492749

27502750
# Conda does not set FCFLAGS, so we copy from FFLAGS here
27512751
FCFLAGS="$FFLAGS"
2752-
LDFLAGS="$LDFLAGS -L${CONDA_PREFIX}/lib -Wl,-rpath,${CONDA_PREFIX}/lib"
27532752
# Conda pkg-config includes this already, but in case we have one from
27542753
# the system...
27552754
PKG_CONFIG_PATH="$PKG_CONFIG_PATH:${CONDA_PREFIX}/lib/pkgconfig"

src/amuse_brutus/support/configure

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2871,7 +2871,6 @@ then :
28712871

28722872
# Conda does not set FCFLAGS, so we copy from FFLAGS here
28732873
FCFLAGS="$FFLAGS"
2874-
LDFLAGS="$LDFLAGS -L${CONDA_PREFIX}/lib -Wl,-rpath,${CONDA_PREFIX}/lib"
28752874
# Conda pkg-config includes this already, but in case we have one from
28762875
# the system...
28772876
PKG_CONFIG_PATH="$PKG_CONFIG_PATH:${CONDA_PREFIX}/lib/pkgconfig"

src/amuse_bse/support/configure

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2387,7 +2387,6 @@ then :
23872387
23882388
# Conda does not set FCFLAGS, so we copy from FFLAGS here
23892389
FCFLAGS="$FFLAGS"
2390-
LDFLAGS="$LDFLAGS -L${CONDA_PREFIX}/lib -Wl,-rpath,${CONDA_PREFIX}/lib"
23912390
# Conda pkg-config includes this already, but in case we have one from
23922391
# the system...
23932392
PKG_CONFIG_PATH="$PKG_CONFIG_PATH:${CONDA_PREFIX}/lib/pkgconfig"

src/amuse_capreole/support/configure

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2403,7 +2403,6 @@ then :
24032403
24042404
# Conda does not set FCFLAGS, so we copy from FFLAGS here
24052405
FCFLAGS="$FFLAGS"
2406-
LDFLAGS="$LDFLAGS -L${CONDA_PREFIX}/lib -Wl,-rpath,${CONDA_PREFIX}/lib"
24072406
# Conda pkg-config includes this already, but in case we have one from
24082407
# the system...
24092408
PKG_CONFIG_PATH="$PKG_CONFIG_PATH:${CONDA_PREFIX}/lib/pkgconfig"

src/amuse_etics/support/configure

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2752,7 +2752,6 @@ then :
27522752

27532753
# Conda does not set FCFLAGS, so we copy from FFLAGS here
27542754
FCFLAGS="$FFLAGS"
2755-
LDFLAGS="$LDFLAGS -L${CONDA_PREFIX}/lib -Wl,-rpath,${CONDA_PREFIX}/lib"
27562755
# Conda pkg-config includes this already, but in case we have one from
27572756
# the system...
27582757
PKG_CONFIG_PATH="$PKG_CONFIG_PATH:${CONDA_PREFIX}/lib/pkgconfig"

src/amuse_evtwin/support/configure

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2390,7 +2390,6 @@ then :
23902390
23912391
# Conda does not set FCFLAGS, so we copy from FFLAGS here
23922392
FCFLAGS="$FFLAGS"
2393-
LDFLAGS="$LDFLAGS -L${CONDA_PREFIX}/lib -Wl,-rpath,${CONDA_PREFIX}/lib"
23942393
# Conda pkg-config includes this already, but in case we have one from
23952394
# the system...
23962395
PKG_CONFIG_PATH="$PKG_CONFIG_PATH:${CONDA_PREFIX}/lib/pkgconfig"

src/amuse_fastkick/support/configure

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2651,7 +2651,6 @@ then :
26512651

26522652
# Conda does not set FCFLAGS, so we copy from FFLAGS here
26532653
FCFLAGS="$FFLAGS"
2654-
LDFLAGS="$LDFLAGS -L${CONDA_PREFIX}/lib -Wl,-rpath,${CONDA_PREFIX}/lib"
26552654
# Conda pkg-config includes this already, but in case we have one from
26562655
# the system...
26572656
PKG_CONFIG_PATH="$PKG_CONFIG_PATH:${CONDA_PREFIX}/lib/pkgconfig"

0 commit comments

Comments
 (0)