Skip to content

Commit

Permalink
Merge pull request #40 from mjuric/master
Browse files Browse the repository at this point in the history
conda and make compatibility fixes
  • Loading branch information
Bill-Gray committed Mar 24, 2023
2 parents 2e66a84 + 26ca430 commit b2b380f
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 3 deletions.
File renamed without changes.
4 changes: 2 additions & 2 deletions makefile
Expand Up @@ -194,8 +194,8 @@ findorb.o: findorb.cpp
clipfunc.o: clipfunc.cpp
$(CXX) $(CXXFLAGS) $(CURSES_FLAGS) $<

getstrex.o: getstrex.c
$(CC) $(CXXFLAGS) $(CURSES_FLAGS) $<
getstrex.o: getstrex.cpp
$(CXX) $(CXXFLAGS) $(CURSES_FLAGS) $<

$(FO_EXE): fo.o $(OBJS) $(RES_FILENAME)
$(CXX) -o $(FO_EXE) fo.o $(OBJS) $(LIBS) $(RES_FILENAME) $(LDFLAGS)
Expand Down
5 changes: 4 additions & 1 deletion miscell.cpp
Expand Up @@ -119,6 +119,7 @@ void ensure_config_directory_exists()
// Going forward it'd be good to reqork Find_Orb to search for data in
// default directories if local copies don't exist
#include "prefix.h"
static char PREFIX_STATIC[500] = PREFIX;
void ensure_config_directory_exists()
{
if (!use_config_directory)
Expand All @@ -127,7 +128,9 @@ void ensure_config_directory_exists()
// The c_str() magic in the next line allows conda-build's prefix
// replacer to work as expected.
// See https://github.com/conda/conda-build/issues/1674 for details.
std::string prefix = std::string(PREFIX).c_str();
// Modified on 2023-03-17 to add PREFIX_STATIC as compilers have
// gotten too clever & the existing workaround stopped working.
std::string prefix = std::string(PREFIX_STATIC).c_str();

if (prefix == "~") {
// backwards compatibility; do nothing.
Expand Down

0 comments on commit b2b380f

Please sign in to comment.